changed Role.USER to Role.user
Merge branch 'master' of https://github.com/rantion/Java-II-Lab
this commit is having luis's stuff working