Merge branch 'master'
welcome page updates
User Navigation Controller ('edit' function, draft)
Update login.ftl

change style table to div
changing bootstrap.min.css version
add new ftl
update for 'edit'
create user
EditPage
create page
courses updates
Merge remote-tracking branch 'origin/Develop' into Develop

Conflicts:
	src/main/java/rtc/app/controllers/UserNavController.java
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
upd 'edit'
Create userContent
Merge remote-tracking branch 'origin/Develop' into Develop

Conflicts:
	src/main/java/rtc/app/controllers/UserController.java
	src/main/java/rtc/app/controllers/UserNavController.java
	src/main/webapp/resources/messages_en.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