bugfix
Merge branch 'develop' of github.com:afitterling/rails4base