deleted some templates
Merge branch 'master' of https://github.com/bradens/Aduno
Merge branch 'master' of https://github.com/bradens/Aduno
Revamped login process
fixed merge conflicts