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
buttons
editing mistakes
editing mistakes
editing mistakes
editing mistakes
editing mistakes
change image back.jpeg

Signed-off-by: LisitsaAlexandr <scorpter@mail.ru>
Update registration.ftl
Update viewPage.ftl
Update edit.ftl
Update edit.ftl
Update viewPage.ftl