Icons all over
Merge remote-tracking branch 'origin/master'

Conflicts:
	LocaLoca/app/src/main/res/layout/activity_ite_main_menu.xml