request small function icons
Merge branch 'master' of https://github.com/rocrail/andRoc

Conflicts:
	AndroidManifest.xml