merge
Merge branch 'master' of https://github.com/fuqcool/cube-app

Conflicts:
	src/js/app.js