Theme, theme, theme...
Merge branch 'master' of github.com:fat0troll/e4

Conflicts:
	app/views/forum/index.html.erb