New changelist
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/maps.js
	js/maps.ts
	js/zepto.d.ts
	js/zepto.js
we're back in business baby!