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

Conflicts:
	app/controller/DashboardC.js
	app/view/AddNote.js
	app/view/AddToList.js
	app/view/DeleteItem.js
	app/view/Main.js
	app/view/MyItemList.js
	app/view/Shops.js
	resources/css/app.css
	resources/sass/app.scss
	resources/sass/button.scss
	resources/sass/toolbar.scss
css changed and popup height issue solved