icons and st00f
icon files
Merge branch 'master' into fela_js

Conflicts:
	js/modules/units.js
Merge pull request #21 from felamaslen/fela_js

icons and st00f