added icons
Merge branch 'master'

Conflicts:
	MapApp/res/values/strings.xml
conflict with strings
conflicts with strings