added view counter and favorites feature
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/controllers/contents_controller.rb
	app/views/contents/search.html.erb
	app/views/pages/index.html.erb