Merge remote-tracking branch 'github/master'

Conflicts:
	.gitignore
	Gemfile
	Gemfile.lock
	Rakefile
	app/assets/javascripts/application.js
	app/controllers/application_controller.rb
	app/helpers/application_helper.rb
	app/views/layouts/application.html.erb
	config/application.rb
	config/environment.rb
	config/environments/development.rb
	config/environments/production.rb
	config/environments/test.rb
	config/initializers/secret_token.rb
	config/initializers/session_store.rb
	config/routes.rb