map obj
Merge branch 'master' of https://github.com/eduardo-born/AEC-Hackathon

Conflicts:
	App/platforms/android/bin/HelloCordova.apk
	App/platforms/android/bin/resources.ap_
Merge branch 'master' of https://github.com/eduardo-born/AEC-Hackathon
map