bug fixes to CSR
Merge branch 'rails32' of github.com:portablemind/compass_agile_enterprise into rails32