control objective items cleanup
Merge branch 'rails4' of github.com:cirope/mawidabp into rails4
Merge branch 'rails4' of github.com:cirope/mawidabp into rails4
detractor test fixes #43