Merge branch 'develop'
Merge branch 'develop'
Build release version
Build release version
Merge branch 'master'
Updated Rock to latest develop release
Wrap context changes in new UnitOfWorkScope so context doesn't bog down
Updated license header
Use different context to save changes