Merge remote-tracking branch 'origin/master'

Conflicts:
	AvenueCodeTest/app/src/debug/res/values/google_maps_api.xml
	AvenueCodeTest/app/src/main/java/br/com/dahoraapps/avenuecodetest/activity/MainActivity.java
Merge remote-tracking branch 'origin/master'