Merge "Adds documentation for Javelin"