Changing user roles.
Merge branch 'master' of https://github.com/krzysztof-trzepla/tai2014

Conflicts:
	src/main/java/pl/edu/agh/student/service/UserServiceImpl.java