* Mongoid 4.0.0.beta1 support
Merge branch 'release/5.0.0.beta1' into develop

* release/5.0.0.beta1:
  * Mongoid 4.0.0.beta1 support
fixed conflicts