taking pull
add twitter page
Merge branch 'master' of https://github.com/WeberStudio/MarlowApp

Conflicts:
	app.js
	app/controller/DashboardC.js
	marlow_admin/application/logs/log-2013-09-19.php
taking pull
taking pull
Merge branch 'master' of https://github.com/WeberStudio/MarlowApp

Conflicts:
	marlow_admin/application/logs/log-2013-09-19.php
DeleteItem
Merge branch 'master' of https://github.com/WeberStudio/MarlowApp

Conflicts:
	app.js
	app/view/Dashboard.js
	app/view/DeleteItem.js
	build/MarlowApp/production/app.js
	build/MarlowApp/production/app.json
	build/MarlowApp/production/index.html
	build/MarlowApp/production/resources/css/app.css
	build/MarlowApp/production/resources/images/marlow/arrow.png
	marlow_admin/application/logs/log-2013-09-23.php
	resources/css/app.css