Removed explicit rails dependency
Bumped up version
Merge branch 'refs/heads/dev'