Update application to run on Rails 4 with Simple Form 3.0.0.beta1
Require Ruby 2.0 from the Gemfile
Regenerate articles controller with simple code, remove attr accessible call and fix deprecation warning
Merge branch 'master' into heroku

Conflicts:
	app/controllers/articles/comments_controller.rb
	app/controllers/articles_controller.rb
	config/application.rb
Enable Rails serve static assets for now in heroku
Fix redirect url