Did java doc for Catapult
Merge origin/master