user friendly email. simply overwrite templates/cmsplugin_contact_plus/email.txt to use your own
Merge branch 'master' of ssh://bitbucket.org/arteria/cmsplugin_contact_plus

Conflicts:
	setup.py
Merge branch 'master' of https://github.com/arteria/cmsplugin-contact-plus

Conflicts:
	cmsplugin_contact_plus/templates/cmsplugin_contact_plus/email.txt
	setup.py