work on tomcat
finish moving role checking to the right place
Merge branch 'develop' of github.com:wazari972/WebAlbums-3 into develop