?
Merge branch 'master' of https://github.com/geoonn/app

Conflicts:
	alloy.js