upload
Merge remote-tracking branch 'origin/Develop' into Develop
 upload photo and add to database
Merge remote-tracking branch 'origin/Develop' into Develop

Conflicts:
	src/main/java/net/github/rtc/app/utils/Bootstrap.java
	src/main/webapp/WEB-INF/pages/portal/admin/user/content/createContent.ftl
	src/main/webapp/WEB-INF/pages/portal/admin/user/content/createUser.ftl
	src/main/webapp/WEB-INF/pages/portal/admin/user/content/editPage.ftl
Merge remote-tracking branch 'origin/Develop' into Develop
add multipart to form
add path to image folder
created photo upload
add image user
upload photo
add style for photo
add to macro multipart
Merge remote-tracking branch 'origin/Develop' into Develop