- icons
Merge branch 'master' of https://github.com/og2t/patch

Conflicts:
	js/main.js