equ assets
Merge branch 'master' of https://github.com/pegdigital/Around-Sound

Conflicts:
	.idea/workspace.xml
	js/scene.homeScreen.js
	js/scene.homeScreen.js.map
	js/scene.homeScreen.ts
	js/spotted.ts