Fixed a message
Merge branch 'develop' into rails4