merging
Merge branch 'master' of https://github.com/eangeles/wgl

Conflicts:
	js/controllers/LoginController.js
Merge branch 'master' of https://github.com/eangeles/wgl
stations.html is now responsive