reset key
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	html5/js/controllers/demo.js