test2
resolve
Merge branch 'master' of https://github.com/sdusza/nxCMS.git

Conflicts:
	src/main/java/com/cyberdane/nxcms/controllers/AccountFormController.java