Many, many changes.

Too many changes to be commented... just... commit.
Merge branch 'master' of https://github.com/erosethan/cool.new

Conflicts:
	app/controllers/topics_controller.rb