Refactoring to use with rails 4.1
Merge branch 'try_to_fix'

Conflicts:
	lib/the_comments.rb