Delivery Look & Feel
Merge branch 'master' of https://github.com/sebafra/co_app

Conflicts:
	app/Constants.js