Warnings
Javadoc
Merge branch 'origin/master'