Adding MapController
Merge branch 'master' of https://github.com/Mondobot/Food-Friendly

Conflicts:
	app/src/main/java/com/example/demouser/foodfriendly/MainMap.java

and changing some things around map showing
Merge branch 'master' of https://github.com/Mondobot/Food-Friendly

Conflicts:
	app/src/main/java/com/example/demouser/foodfriendly/MainMap.java

and changing some things around map showing
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/app.iml