prepare for creating gem
require version
moved User model
added normalize_attributes
Merge branch 'master' into gem

Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/application_controller.rb
	app/models/user.rb
	db/fixtures/use_restrictions.yml
updated gemspec
fixed editing user profiles in development environment
added user attributes
added initial fixture files
updated rake task
updated gemspec
updated gemspec
fixed current_ability
moved initial fixture files
added a generator
updated generator
added quick_install generator
updated dummy migration file
updated generator
updated gemspec