Javadoc

#closes 2226
Merge remote-tracking branch 'origin/master'