Merge branch 'release/release1.0'
--added mongoid
Merge branch 'hotfix/bug1.0' into develop