incomplete changes
resolved conflicts
Merge branch 'master' of https://github.com/CodeTaha/PollingDuck-Spring

Conflicts:
	src/java/controllers/AjaxController.java