Adding Partial implementation for Maps

Still need database before finalizing it.
Merge remote-tracking branch 'origin/master'

Conflicts:
	indytrip/app/app.iml