fixing git issues
Merge remote-tracking branch 'origin/Chapter15'

Conflicts:
	Clok/data/bingMapsWrapper.js