changing bootstrap.min.css version
add new ftl
create user
EditPage
create page
Merge branch 'origin/Develop'

Conflicts:
	src/main/webapp/resources/messages_en.properties
	src/main/webapp/resources/messages_ru.properties
	src/main/webapp/resources/messages_uk.properties
Merge branch 'origin/Develop'

Conflicts:
	src/main/webapp/resources/messages_en.properties
aftermerge fixing
createUser
Merge branch 'master' of https://github.com/ReturnOnIntellingenceTraineeCommunity/rtc-app
create user
change user/model/User.java
create user
UserPage all styles + some logic
Merge remote-tracking branch 'origin/master'
change
Merge branch 'master' of https://github.com/ReturnOnIntellingenceTraineeCommunity/rtc-app
UserResource
Merge remote-tracking branch 'origin/master'
userPage restLogic