console conflict
Merge commit '9161bafd9753ded6ac1f543be0eeb7d69abb717a'

Conflicts:
	platforms/ios/cordova/console.log
googlemaps intial
merge