Merge branch 'master' into heroku

Conflicts:
	app/controllers/articles/comments_controller.rb
	app/controllers/articles_controller.rb
	config/application.rb
Add heroku gem
Merge branch 'master' into heroku

Conflicts:
	Gemfile.lock