DRM-123 fix model for php v > 5.3
DRM-124 remove getList from model collection
DRM-125 joins two one-type collection
Merge branch 'master' into develop
Merge branch 'release/0.1.6'