We're now authenticating instead of logging in. The difference? Not much.
Merge branch 'master' into authenticate
Merge pull request #29 from ifiske/authenticate

Authenticate
Merge branch 'master' into ifiske2.0

Conflicts:
	ifiske-app/www/static/js/api_request.js
	ifiske-app/www/static/js/user.js