Merge branch 'master' of https://github.com/vladotesanovic/atm-finder

Conflicts:
	.idea/misc.xml
	app/build.gradle
	app/src/main/res/drawable-hdpi/ic_launcher.png
	app/src/main/res/drawable-mdpi/ic_launcher.png
	app/src/main/res/drawable-xhdpi/ic_launcher.png
	app/src/main/res/drawable-xxhdpi/ic_launcher.png
	atm-finder.iml