Merge branch 'mauries'
Merge branch 'master' of https://github.com/Zwooosh/MT-Identity
Merge branch 'mauries'

Conflicts:
	app/views/dashboard/cards/edit.html.haml
Merge branch 'master' of https://github.com/Zwooosh/MT-Identity

Conflicts:
	app/views/dashboard/cards/edit.html.haml