Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Updated gems and added Admin Parents resource
Merge branch 'master' into develop