del 2.html
gruntjs config
add grunt
Merge branch 'develop' into feature/scene_transition