Finish account setting and add fail safes to dashboard queries
Merge branch 'master' of github.com:kiasaki/sw-sherbrooke-2014

Conflicts:
	integrations/google_calendar.js