- added update path in manifest file
- added scroll to elements
Merge commit '2955cc115b4648a2867be8b143df3a1432e03d4d' into develop

Conflicts:
	app/scripts/mainui.js