- Rock Plugin Project
Merge branch 'origin/develop'

Conflicts:
	Rock.sln
- More plugin changes
Merge branch 'origin/master'

Conflicts:
	Rock.Migrations/Rock.Migrations.csproj
	Rock.Rest/Rock.Rest.csproj
Merge branch 'feature-dt-rock-plugin'
- Redo plugin project with less dependencies
- Ignore plugin dll's
- Add plugin reference
- Update to run plugin migrations
Merge branch 'feature-dt-plugin'

Conflicts:
	Rock/Rock.csproj