Moved all checking for administrator login to one method
Merge branch 'master' of github.com:sara-nl/appsportal