javadoc
Merge branch 'master' of https://github.com/dzigerlig/CDAR.git

Conflicts:
	WebContent/cdarclient/templates/heading.html