Add some icons
Merge branch 'master' into btConnection

Conflicts:
	application/res/menu/ab.xml