reset to lolas code
Merge branch 'master' of https://github.com/icstars/puzzlepush

Conflicts:
	puzzlepush/scripts/servicecalls.js