Additions of informations in the email sent from user checkout
Merge remote-tracking branch 'origin/master' into master1

Conflicts:
	routes/index.js
Merge remote-tracking branch 'origin/master' into master1