Added JavaDocs to most of mainswordsorcery files
Merge branch 'beforeError'

Conflicts:
	nbproject/project.properties
	src/client/mainswordsorcery/HUDController.java
Merge branch 'beforeError'

Conflicts:
	nbproject/project.properties
	src/client/mainswordsorcery/HUDController.java