add freemarker dependency
Merge branch 'master' of https://github.com/ReturnOnIntellingenceTraineeCommunity/rtc-app

Conflicts:
	pom.xml
	src/main/java/com/springapp/mvc/HelloController.java
	src/main/webapp/WEB-INF/mvc-dispatcher-servlet.xml
	src/main/webapp/WEB-INF/pages/macro.ftl
	src/main/webapp/WEB-INF/web.xml