Vincent Fournier 4a394c56c1 Merge branch 'master' into auth ...

Conflicts:
	app/templates/dashboard/dashboard.js

2015-05-04 10:29:51 -04:00

..

routing_view.js

Merge branch 'master' into auth

2015-05-04 10:29:51 -04:00