Mary
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	app/src/main/java/com/ucab/ecotoolbox/ecotoolbox/MapsActivity.java
	build/intermediates/model_data.bin
Gets