Creates tabbed views of map and places list and adds google places api
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/app.iml
	app/src/main/java/edu/csuchico/cheapgasfinder/GasMapFragment.java