del
del
Merge branch 'origin/Develop'

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/web.xml
del
del
.
Merge remote-tracking branch 'remotes/origin/Develop'

Conflicts:
	pom.xml
	src/main/webapp/WEB-INF/mvc-dispatcher-servlet.xml
	src/main/webapp/WEB-INF/web.xml
Merge branch 'master' of https://github.com/ReturnOnIntellingenceTraineeCommunity/rtc-app
div on reg page
Merge branch 'master' of https://github.com/ReturnOnIntellingenceTraineeCommunity/rtc-app

Conflicts:
	src/main/webapp/WEB-INF/pages/down.ftl
	src/main/webapp/WEB-INF/pages/registration.ftl
	src/main/webapp/WEB-INF/web.xml
added fields to user class
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/WEB-INF/pages/down.ftl
	src/main/webapp/WEB-INF/pages/registration.ftl