Models code moved to concerns
Merge branch 'lib_concerns' into develop
Merge branch 'release-0.0.2'