#24: Adding simple form mail service.
Merge remote-tracking branch 'origin/master' into 27

Conflicts:
	app/index.html