final design changes
Merge branch 'final-design' into develop

Conflicts:
	build/js/player.js
fix gruntfile, smile.png
build kit on watch
fix gruntfile
aadd template
New share flow
update template
Merge branch 'develop' into feature/template
google analytics
finish template
Merge branch 'feature/template' into develop
add GA to template