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

Conflicts:
	app/controller/DashboardC.js
	app/controller/FacebookC.js
	app/controller/TwitterC.js
	app/view/Dashboard.js
	app/view/DashboardDay.js
	app/view/EmailPost.js
	app/view/FacebookV.js
	app/view/Main.js
	app/view/Signup.js
	app/view/TwitterV.js