feat(oauth): multiple strategies per account; changeable email
Merge branch 'canary' into pr/392

Conflicts:
	app/templates/server/api/user(auth)/user.controller.js
	app/templates/server/config/environment/index.js
Merge branch 'canary' into pr/392
style(server): fix some style inconsistency
fix twitter config using wrong field names