Email accounts
Merge remote-tracking branch 'origin/devel' into devel

Conflicts:
	client/views/header/header.html