update to do specs
Merge branch 'master' into sqlserver
Upgrade to Rails 3.2.10
Don't add hours to dollars
Warn if hours are not converted by grand totals
Warn if extra hourly conversion (on accumulated dollars).
show hours label if grid field is in hours.
always show calculations in grid field (but not in totals).
Separate hour totals from dollar totals.
bd_to_s Big Decimal to string given default of 0 decimal places.
Merge branch 'master' into sqlserver