Upgraded Rock to EF6alpha3
Merge branch 'refs/heads/develop' into feature-mp-rock-ef6
Merge branch 'refs/heads/develop' into feature-mp-rock-ef6
Merge branch 'refs/heads/develop' into feature-mp-rock-ef6
Merge branch 'refs/heads/develop' into feature-mp-rock-ef6
Merge branch 'refs/heads/develop' into feature-mp-rock-ef6
+ PotluckDinner sample now demonstrates how to add a custom dll with classes that implement Rock.Data.Model, and therefore have the power of Entity
+ Synced up mychurch-rock sample with RockWeb
Merge branch 'develop'

Conflicts:
	Rock/bin/.gitignore
	Rock/packages.config
	RockWeb/Bin/.gitignore
	RockWeb/Bin/EntityFramework.dll
update merged to ef6
Merge branch 'develop'
Check Scanner - Added Pre-Requisites with OCX Installers so that this can be developed on other machines
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'

Conflicts:
	Rock/packages.config
	RockWeb/Bin/.gitignore
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'

Conflicts:
	Rock/web.config
	RockWeb/Bin/.gitignore
Update to EF6 - Beta1
Merge branch 'develop'