show 3dmodel
Merge branch 'master' of https://github.com/fuqcool/cube-app

Conflicts:
	src/js/directive/perfetch-viewer.js