Readded Javadoc for ServerHelper.
Merge branch 'dev' of ssh://git@github.com/Farenheight/Lidkoping-SH.git into dev