Get rid of useless importants in css
Merge branch 'master' into gh-pages

Conflicts:
	style/main.css