update the read me
Merge branch 'develop' into feature/rails_3.2.12