a couple of French strings lost in translation
Add a form to edit settings
Merge branch 'master' of https://github.com/cozy/cozy-emails
Merge pull request #20 from goofy-bz/patch-1

a couple of French strings lost in translation
Fixed: removed useless statements that cause the app to crash if it had no data
Built
Fixed: code style
Fixed: buildUrl performed mutations on the router's state
Added: missing dependency
Upgraded: permissions
Upgraded: permissions
Updated: instructions to use the app
Merge branch 'master' of https://github.com/cozy/cozy-emails
HTML message management, display and compose
New algorithm to insert line when composing in HTML
Merge pull request #22 from clochix/master

HTML emails
Refactoring: rename left/right to first/second
Merge pull request #23 from clochix/master

Refactoring: rename left/right to first/second
Merge remote-tracking branch 'cozy/master'

Conflicts:
	build/client/public/js/app.js
	build/client/public/js/app.js.map
	build/client/public/js/vendor.js
	build/client/public/js/vendor.js.map
	build/server/controllers/accounts.js
	build/server/controllers/index.js
	build/server/controllers/messages.js
	build/server/controllers/routes.js
	build/server/models/account.js
	build/server/models/message.js
	build/server/models/requests.js
	build/server/utils/errors.js
	client/app/libs/PanelRouter.coffee
	package.json