Merge branch 'master'
Add pmd an jacoco plugins. Let's go to write clean code
page controll
Merge branch 'origin/admin'
style hotfix
moved style to css file
merge user integration
Merge remote-tracking branch 'origin/master'

Conflicts:
	pom.xml
	src/main/resources/spring/restTemplate.xml
Merge fixes
User webservice controller change
change User.java
chang package
User webservice controller change
change restTemplate
Merge branch 'master' of https://github.com/ReturnOnIntellingenceTraineeCommunity/rtc-app
add test class
package's editing
test's
test's
Merge branch 'origin/admin'

Conflicts:
	src/main/java/net/github/rtc/web/courses/resource/impl/CoursesResourceImpl.java
	src/main/webapp/WEB-INF/pages/admin/courses/course.ftl
	src/main/webapp/WEB-INF/pages/admin/courses/courses.ftl
	src/main/webapp/WEB-INF/pages/admin/courses/create_courses.ftl
	src/main/webapp/WEB-INF/pages/admin/courses/update.ftl