email added and main mealo page modified
Merge branch 'dev' of https://github.com/sobingt/mealo into dev

Conflicts:
	app.js
	routes/get.js
	routes/getjson.js