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

Conflicts:
	src/main/java/cdar/bll/wiki/WikiRegistrationManager.java