Fix for Hash in fields_for
bump version
Merge branch 'refs/heads/dev'