revert style
Merge branch 'master' into stable

Conflicts:
	main/views/index.jade