more cleanup of seminars
Merge branch 'master' into seminars
Merge branch 'master' into seminars
Initial copy of Rails 4.0.0 default config
Use procs for all scopes
Merge branch 'master' into rails4

Conflicts:
	Gemfile
	Gemfile.lock
	app/models/invoice.rb
	app/models/invoiceline.rb
	app/models/project.rb
	config/application.rb
	config/environments/development.rb
	config/routes.rb
Rails 4.0.0.rc1
Replace encrypted_cookie_store with cookie_store
Merge branch 'master' into rails4

Conflicts:
	Gemfile.lock
Add rails observers
Get rid of sweepers
Add protected_attributes gem for Rails 3.2 compatibility
Validate the whole string, not just the line
Use new scopes for has_many in Linkable
Use new rails 4 scopes
Don't mix new/old scopes
Use new scope for order statements
Fix a ton of deprecations; lots more to go...
More rails 4 compatibility
Fix rails 4 compatibility