icons url
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/blocks/resources/resources.styl
Merge pull request #80 from Aminopyridin/master

icons url