The second edition.
Merge https://github.com/BinaryRhythm/RailsSpace

Conflicts:
	.gitignore
	Gemfile
	Gemfile.lock
	app/assets/stylesheets/site.css
	app/controllers/application_controller.rb
	app/controllers/site_controller.rb
	app/controllers/user_controller.rb
	app/helpers/application_helper.rb
	app/helpers/user_helper.rb
	app/models/user.rb
	app/views/layouts/application.html.erb
	app/views/user/index.html.erb
	app/views/user/register.html.erb
	config/environment.rb
	config/routes.rb
	db/migrate/20130511023905_create_users.rb
	db/schema.rb
	test/functional/site_controller_test.rb
	test/functional/user_controller_test.rb