Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
footer corrected
Merge remote-tracking branch 'upstream/master'
Merge pull request #76 from Aminopyridin/master

footer corrected
Merge pull request #78 from Aminopyridin/master

Merge remote-tracking branch 'upstream/master'
fix submit on form
styles fixes

Conflicts:
	app/blocks/resources/resources.styl
search outline fix
Merge pull request #79 from fanatid/findbutton

fix submit on form
icons url
Merge remote-tracking branch 'upstream/master'

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

icons url
icons url
Merge pull request #81 from Aminopyridin/master

icons url
fix suggest list
Merge remote-tracking branch 'upstream/master'