First pass as upgrade to rails 4.0
Merge branch 'master' into rails_4_0

Conflicts:
	config/application.rb
Merge branch 'master' into rails_4_0
Move stylesheets, js, and images around

to match the asset pipeline expectations
Merge branch 'master' into rails_4_0
Merge branch 'master' into rails_4_0
Merge branch 'master' into rails_4_0
Merge branch 'master' into rails_4_0
Move files around for asset pipeline.
Move files around for asset pipeline, p 2
Switch to jquery-ui gem
Complete upgrade to asset pipeline
Update point_in_time gem
Slew of updates to squash deprecation warnings
Update controllers of simple look-up tables

with strong parameters
Clean up icons, removing those not used
Update allocations controller with strong params
Update flex reports for strong params
Update customer controller with strong params
Update runs controller for strong params