add test scenarios
Corrected url regex for localhost
Added coverage
user:  .feature file check
group consolidation and coverage
small beautification
Merge branch 'master' into invitation-accept-deny
1st try
Reputation base system (inactive)
Merge branch 'reputation-create'
eliminate flickering
Merge branch 'refactor-test-coverage'
rails bugfix fixed - remove santa
Merge branch 'master' of github.com:piffy/houserule

Conflicts:
	app/models/user.rb
	config/routes.rb
Events: complete
Reservations: start
Merge branch 'master' into i18n

Conflicts:
	app/views/events/_index_listing.html.haml (hopefully solved)