add icons for Chrome Apps
Merge branch 'master' into ionic

Conflicts:
	Makefile
update app icons
Merge branch 'master' into ionic