Merge pull request #3 from technic-programming/develop

Merge tag '2015' into develop
App.yaml admin login fixed
A lot of stuff