Version 1.1.6
Restart uwsgi to finish the upgrade.
Merge branch '1.1.x'
Make the body optional.

fix #605
Merge branch '1.1.x'
Merge branch 'master' of https://github.com/tonioo/modoboa
Clarifiy the restart process at the end of the upgrade.
Merge pull request #604 from aanriot/master

Restart uwsgi to finish the upgrade.
Merge branch 'master' into Toc-Toc-update-template-585

Conflicts:
	modoboa/extensions/webmail/forms.py
Infinite scroll improvement (webmail).

see #585