Started work on custom forum solution
Update topic views
Updates to forum
Slight redesign of forum, categories frontend mostly done.
More updates to forum, getting close to working state
Merge branch 'master' into feature-forum

Merge in gem updates from master branch.
Merge branch 'master' into feature-forum

Merged in updates to guard gems.
Merge branch 'master' into feature-forum and finish forum impl

Conflicts:
	app/helpers/application_helper.rb