fixed bugs in CSR
Merge branch 'master' of github.com:portablemind/compass_agile_enterprise