authtentication
Merge branch 'develop' of https://github.com/Schosser/MasterLabProject09_2013 into develop