Spring security
Merge branch 'master' of https://github.com/revcommunity/revcommunity

Conflicts:
	src/main/java/org/revcommunity/controller/UserController.java