Zohaib [24-09-2013]
Merge branch 'master' of https://github.com/WeberStudio/MarlowApp

Conflicts:
	app/controller/DashboardC.js
	app/view/AddToList.js
	app/view/MyList.js
	marlow_admin/application/logs/log-2013-09-23.php