Added precomposed keywords for getting full control over the icons and adds android support
Added ipad retina icon
Merge branch 'master' into develop

Conflicts:
	index.html