-Package name corrected, google maps ready.
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/app.iml
Merge remote-tracking branch 'origin/master'
-Map with localization ready