test 2
Merge branch 'master' of https://github.com/dimce011/campus201305.git

Conflicts:
	mpayments-help/mpayments-help-repo-rest/src/main/webapp/WEB-INF/templates/helloworld.ftl