Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/gradle.xml
	app/src/main/java/com/tritonmon/activity/MapsActivity.java
	gradle/wrapper/gradle-wrapper.properties