Merge branch 'feature/upgrade-mongoid-3.1' into develop
Fix name / as bug with polymorphism
Merge pull request #3 from jwg2s/develop

Fix polymorphism bug