challenge 2879
ForceLogic 2879
Merge branch 'master' of https://github.com/enreeco/projectCorona into enreeco-master

Conflicts resolved:
	sfdc.js
	web.js
fixing up map positioning