update
Merge branch 'release/0.8'
update release 0.8
Conflicts:
	www/app/app.js
	www/js/script.js