(Desktop)
All source files in the desktop application now contains comments in javadoc syntax
Merge origin/master