Newt demo
Merge branch 'master' of
https://github.com/WebActivities/webactivities-os

Conflicts:
	WebActivities/apps/app2/activity.js
	WebActivities/js/toolbar.js