Zohaib
Merge branch 'master' of https://github.com/WeberStudio/MarlowApp

Conflicts:
	app/view/AddNote.js
	app/view/AddToList.js
	app/view/DeleteItem.js
	app/view/MyItemList.js
	app/view/MyList.js
	app/view/Shops.js
	app/view/Snap.js
	marlow_admin/application/logs/log-2013-09-19.php
	resources/css/app.css