Account settings
Merge branch 'master' of github.com:kiasaki/sw-sherbrooke-2014

Conflicts:
	routes/app.js