Merge pull request #4 from afraazali/feature/login

Feature/login
Merge pull request #5 from afraazali/bugfix/testbed-domain

Bugfix/testbed domain
changed the url to notes
update controllers
ngigngerge branch 'master' of https://github.com/TinyHook/noteTakingAppNo
fixed some routes, included the menu and login check
Merge pull request #6 from TinyHook/master

Login changes
Merge remote-tracking branch 'naz/master' into feature/logged-in-menu

Conflicts:
	app/index.html
	app/scripts/app.js
	app/scripts/controllers/main.js
	app/scripts/services/userservice.js