f0rced to commit :-(
Merge branch 'master' of https://github.com/cs3216-group1/nusmods
add alert message when user is not login
Merge branch 'master' of https://github.com/cs3216-group1/nusmods

Conflicts:
	app/scripts/common/views/AppView.js
	app/scripts/merger/controllers/MergerTimetableController.js