fixed action bar in Map Activity
optimize imports
Merge branch 'master' of https://github.com/westjour/CodeMichApp into jourdans

Conflicts:
	MyApplication/app/src/main/java/com/example/jourdan/myapplication/MapActivity.java
more conf
commits

Conflicts:

	MyApplication/app/src/main/java/com/example/jourdan/myapplication/MapActivity.java
msg
msg2
changes