Shake event
Merge branch 'master' of https://github.com/citycrush/citycrush
Shake event v2
Merge branch 'master' of https://github.com/citycrush/citycrush

Conflicts:
	dist/test/index.html