Rails 4.2 RC2
Updated Rails 4.2 RC2
Merge branch 'master' into rails3.2

Conflicts:
	Gemfile.lock
Updated gems
Rails 4.2 rc3
Upgrade to Rails 4.2 GA, add web-console gem
Upgrade fix - s/serve_static_assets/serve_static_files/, set tests to be run in random order
Merge branch 'master' into rails3.2

Conflicts:
	Gemfile.lock
Merge branch 'master' into rails4.2

Conflicts:
	Gemfile.lock
updated gems - including re-upgrading AR-import
Upgrade to friendly_id 5.1 beta to fix a number of test failures with finders
Merge branch 'quick-entry'
Merge branch 'rails4.2'