Renamed
rejig icons
Merge branch 'master' of https://github.com/cyclestreets/android

Conflicts:
	settings.gradle
renamed dir again