added callback
migrating to spacebrew
Merge branch 'master' of https://github.com/site2site/pinpoint

Conflicts:
	app-sb.js
	shapemaker.js