changed freemarker, restapi
Merge branch 'master' of https://github.com/dimce011/campus201305.git

Conflicts:
	mpayments-help/mpayments-help-repo-rest/src/main/java/org/infobip/mpayments/help/repo/rest/RestAPI.java