icons
Merge branch 'ironkman' into gh-pages

Conflicts:
	images/default-thumb.png