Merge branch 'api_controller' into gh-pages
Improved login and signup
Merge branch 'gh-pages' into api_controller