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

Conflicts:
	app/view/Dashboard.js
	app/view/MyItemList.js
dashboard
Merge branch 'master' of https://github.com/WeberStudio/MarlowApp
fixed issues
Merge branch 'master' of https://github.com/WeberStudio/MarlowApp