Mapping added

Between Role - User - Logigng history - Messages
Merge branch 'master' of https://github.com/mickoleusz/StudentsLife_2013

Conflicts:
	StudentsLife/WebContent/SpringMakesMeCry/Administrator/index.jsp
	StudentsLife/WebContent/SpringMakesMeCry/Ranking/index.jsp
	StudentsLife/src/studentsLife/services/UsersService.java