Merge branch 'upgrades' into asset_pipeline

Conflicts:
	Gemfile
	Gemfile.lock
fixes for production deployment of assets
use gem versions of ckeditor, jquery, jquery-ui

Upgraded to jquery-ui 1.10, which required some refactoring of JS
Upgraded fullcalendar to support new jquery
fix specs
Merge branch 'asset_pipeline' into asset_pipeline_upgrades
fixes for reports export and pagination
pull in previous jquery ui theme
add gem 'turbo-sprockets-rails3' for faster asset precompilation
Merge branch 'asset_pipeline_upgrades' into upgrades

Conflicts:
	Gemfile