Consistency Sweep:  Tabs to Spaces (not all files yet),  GhostDoc sweep, Block to RockBlock, Page to RockPage, [FieldTypes]Person to PersonField, Remove/Sort Usings (not all files yet), FormatDocument (not all files yet)
starting validation fixups
small fix in XSLT for implied relationships photo display
Renamed "Model" to "Entity", and "ModelWithAttributes" to "Model".  Model extends Entity and adds security and attributes.  So now, if a code-first object should have security and attributes, it should inherit from Block<T>, if not, it should inherit from Entity<T>.
Add ToString() method to each entity class
Create new way of auditing entity changes.  Instead of each entity having the DateCreated, DateModified, CreatedBy, and ModifiedBy properties, each add, modify, delete is now logged to a new Core.Audit table.
Fixed up accidently deleted  feature-mp-consistencysweep branch
minor cleanup
Merge remote-tracking branch 'origin/feature-mp-recover02' into develop
Added UniqueGuids migration to .csproj
Create new way of auditing entity changes.  Instead of each entity having the DateCreated, DateModified, CreatedBy, and ModifiedBy properties, each add, modify, delete is now logged to a new Core.Audit table.
Consolidated the Grid Javascript Confirm script into Grid/DeleteField
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	Rock/CMS/Auth.cs
	Rock/CMS/AuthDTO.cs
	Rock/CMS/AuthService.cs
	Rock/CMS/Block.cs
	Rock/CMS/BlockDto.cs
	Rock/CMS/BlockService.cs
	Rock/CMS/BlockType.cs
	Rock/CMS/BlockTypeDto.cs
	Rock/CMS/BlockTypeService.cs
	Rock/CMS/File.cs
	Rock/CMS/FileDTO.cs
	Rock/CMS/FileService.cs
	Rock/CMS/HtmlContent.cs
	Rock/CMS/HtmlContentDTO.cs
	Rock/CMS/HtmlContentService.cs
	Rock/CMS/Page.cs
	Rock/CMS/PageContext.cs
	Rock/CMS/PageContextDTO.cs
	Rock/CMS/PageContextService.cs
	Rock/CMS/PageDTO.cs
	Rock/CMS/PageRoute.cs
	Rock/CMS/PageRouteDTO.cs
	Rock/CMS/PageRouteService.cs
	Rock/CMS/PageService.cs
	Rock/CMS/Site.cs
	Rock/CMS/SiteDTO.cs
	Rock/CMS/SiteDomain.cs
	Rock/CMS/SiteDomainDTO.cs
	Rock/CMS/SiteDomainService.cs
	Rock/CMS/SiteService.cs
	Rock/CMS/User.cs
	Rock/CMS/UserDTO.cs
	Rock/CMS/UserService.cs
	Rock/CRM/CampusDTO.cs
	Rock/CRM/CampusService.cs
	Rock/CRM/EmailTemplate.cs
	Rock/CRM/EmailTemplateDTO.cs
	Rock/CRM/EmailTemplateService.cs
	Rock/CRM/Location.cs
	Rock/CRM/LocationDto.cs
	Rock/CRM/LocationService.cs
	Rock/CRM/Person.cs
	Rock/CRM/PersonDTO.cs
	Rock/CRM/PersonMerged.cs
	Rock/CRM/PersonMergedDTO.cs
	Rock/CRM/PersonMergedService.cs
	Rock/CRM/PersonService.cs
	Rock/CRM/PersonViewed.cs
	Rock/CRM/PersonViewedDTO.cs
	Rock/CRM/PhoneNumber.cs
	Rock/CRM/PhoneNumberDTO.cs
	Rock/CRM/PhoneNumberService.cs
	Rock/Core/Attribute.cs
	Rock/Core/AttributeDTO.cs
	Rock/Core/AttributeQualifier.cs
	Rock/Core/AttributeQualifierDTO.cs
	Rock/Core/AttributeQualifierService.cs
	Rock/Core/AttributeService.cs
	Rock/Core/AttributeValue.cs
	Rock/Core/AttributeValueDTO.cs
	Rock/Core/AttributeValueService.cs
	Rock/Core/DefinedType.cs
	Rock/Core/DefinedTypeDTO.cs
	Rock/Core/DefinedTypeService.cs
	Rock/Core/DefinedValue.cs
	Rock/Core/DefinedValueDTO.cs
	Rock/Core/DefinedValueService.cs
	Rock/Core/EntityChange.cs
	Rock/Core/EntityChangeDTO.cs
	Rock/Core/ExceptionLog.cs
	Rock/Core/ExceptionLogDTO.cs
	Rock/Core/ExceptionLogService.cs
	Rock/Core/FieldType.cs
	Rock/Core/FieldTypeDTO.cs
	Rock/Core/FieldTypeService.cs
	Rock/Core/Metric.cs
	Rock/Core/MetricDTO.cs
	Rock/Core/MetricService.cs
	Rock/Core/MetricValue.cs
	Rock/Core/MetricValueDTO.cs
	Rock/Core/MetricValueService.cs
	Rock/Core/ServiceLog.cs
	Rock/Core/ServiceLogDTO.cs
	Rock/Core/Tag.cs
	Rock/Core/TagDto.cs
	Rock/Core/TagService.cs
	Rock/Core/TaggedItem.cs
	Rock/Core/TaggedItemDto.cs
	Rock/Core/TaggedItemService.cs
	Rock/Data/EFRepository.cs
	Rock/Data/IDto.cs
	Rock/Data/Model.cs
	Rock/Data/ModelWithAttributes.cs
	Rock/Data/RockContext.cs
	Rock/Data/Service.cs
	Rock/ExtensionMethods.cs
	Rock/Field/Types/Date.cs
	Rock/Financial/Batch.cs
	Rock/Financial/BatchDTO.cs
	Rock/Financial/BatchService.cs
	Rock/Financial/Fund.cs
	Rock/Financial/FundDTO.cs
	Rock/Financial/FundService.cs
	Rock/Financial/Gateway.cs
	Rock/Financial/GatewayDTO.cs
	Rock/Financial/GatewayService.cs
	Rock/Financial/PersonAccountLookupDTO.cs
	Rock/Financial/Pledge.cs
	Rock/Financial/PledgeDTO.cs
	Rock/Financial/PledgeService.cs
	Rock/Financial/TransactionDTO.cs
	Rock/Financial/TransactionDetail.cs
	Rock/Financial/TransactionDetailDTO.cs
	Rock/Financial/TransactionDetailService.cs
	Rock/Financial/TransactionService.cs
	Rock/Groups/Group.cs
	Rock/Groups/GroupDTO.cs
	Rock/Groups/GroupRole.cs
	Rock/Groups/GroupRoleDTO.cs
	Rock/Groups/GroupRoleService.cs
	Rock/Groups/GroupService.cs
	Rock/Groups/GroupType.cs
	Rock/Groups/GroupTypeDTO.cs
	Rock/Groups/GroupTypeService.cs
	Rock/Groups/Member.cs
	Rock/Groups/MemberDTO.cs
	Rock/Groups/MemberService.cs
	Rock/Migrations/201210022114138_AddPageRoutePage.cs
	Rock/Migrations/RockMigration_0.cs
	Rock/Rock.csproj
	Rock/Security/Authorization.cs
	Rock/Util/Job.cs
	Rock/Util/JobDTO.cs
	Rock/Util/JobService.cs
	Rock/Web/UI/ContextBlock.cs
	Rock/Web/UI/Page.cs
	RockWeb/App_Code/Global.asax.cs
	RockWeb/App_Code/Image.ashx.cs
	RockWeb/Blocks/Administration/SystemInfo.ascx.cs
	RockWeb/Blocks/Administration/Tags.ascx.cs
	RockWeb/Blocks/Cms/HtmlContent.ascx.cs
fixed up crlf and tabs (now are spaces) in code generator
regen PhoneNumber DTO/Service
Fix merge oopsies.
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	Rock.CodeGeneration/Form1.cs
	Rock/CRM/PhoneNumberDTO.cs
	Rock/CRM/PhoneNumberService.cs
Update generated files to use spaces instead of tabs
Update Audit migration
Merge branch 'feature-dt-mef-login' into develop

Conflicts:
	Rock.CodeGeneration/Form1.cs
	Rock.REST/Core/AuditsController.cs
	Rock/CMS/AuthDTO.cs
	Rock/CMS/AuthService.cs
	Rock/CMS/BlockDto.cs
	Rock/CMS/BlockService.cs
	Rock/CMS/BlockTypeDto.cs
	Rock/CMS/BlockTypeService.cs
	Rock/CMS/FileDTO.cs
	Rock/CMS/FileService.cs
	Rock/CMS/HtmlContentDTO.cs
	Rock/CMS/HtmlContentService.cs
	Rock/CMS/PageContextDTO.cs
	Rock/CMS/PageContextService.cs
	Rock/CMS/PageDTO.cs
	Rock/CMS/PageRouteDTO.cs
	Rock/CMS/PageRouteService.cs
	Rock/CMS/PageService.cs
	Rock/CMS/SiteDTO.cs
	Rock/CMS/SiteDomainDTO.cs
	Rock/CMS/SiteDomainService.cs
	Rock/CMS/SiteService.cs
	Rock/CMS/UserDTO.cs
	Rock/CMS/UserService.cs
	Rock/CRM/Campus.cs
	Rock/CRM/CampusDTO.cs
	Rock/CRM/CampusService.cs
	Rock/CRM/EmailTemplateDTO.cs
	Rock/CRM/EmailTemplateService.cs
	Rock/CRM/LocationDto.cs
	Rock/CRM/LocationService.cs
	Rock/CRM/PersonDTO.cs
	Rock/CRM/PersonMergedDTO.cs
	Rock/CRM/PersonMergedService.cs
	Rock/CRM/PersonService.cs
	Rock/CRM/PhoneNumberDTO.cs
	Rock/CRM/PhoneNumberService.cs
	Rock/Core/AttributeDTO.cs
	Rock/Core/AttributeQualifierDTO.cs
	Rock/Core/AttributeQualifierService.cs
	Rock/Core/AttributeService.cs
	Rock/Core/AttributeValueDTO.cs
	Rock/Core/AttributeValueService.cs
	Rock/Core/Audit.cs
	Rock/Core/AuditDto.cs
	Rock/Core/AuditService.cs
	Rock/Core/DefinedTypeDTO.cs
	Rock/Core/DefinedTypeService.cs
	Rock/Core/DefinedValueDTO.cs
	Rock/Core/DefinedValueService.cs
	Rock/Core/ExceptionLogDTO.cs
	Rock/Core/ExceptionLogService.cs
	Rock/Core/FieldTypeDTO.cs
	Rock/Core/FieldTypeService.cs
	Rock/Core/MetricDTO.cs
	Rock/Core/MetricService.cs
	Rock/Core/MetricValueDTO.cs
	Rock/Core/MetricValueService.cs
	Rock/Core/Tag.cs
	Rock/Core/TagDto.cs
	Rock/Core/TagService.cs
	Rock/Core/TaggedItemDto.cs
	Rock/Core/TaggedItemService.cs
	Rock/Data/EFRepository.cs
	Rock/Data/Service.cs
	Rock/Financial/BatchDTO.cs
	Rock/Financial/BatchService.cs
	Rock/Financial/FundDTO.cs
	Rock/Financial/FundService.cs
	Rock/Financial/GatewayDTO.cs
	Rock/Financial/GatewayService.cs
	Rock/Financial/PledgeDTO.cs
	Rock/Financial/PledgeService.cs
	Rock/Financial/TransactionDTO.cs
	Rock/Financial/TransactionDetailDTO.cs
	Rock/Financial/TransactionDetailService.cs
	Rock/Financial/TransactionService.cs
	Rock/Groups/GroupDTO.cs
	Rock/Groups/GroupRoleDTO.cs
	Rock/Groups/GroupRoleService.cs
	Rock/Groups/GroupService.cs
	Rock/Groups/GroupTypeDTO.cs
	Rock/Groups/GroupTypeService.cs
	Rock/Groups/MemberDTO.cs
	Rock/Groups/MemberService.cs
	Rock/Rock.csproj
	Rock/Util/JobDTO.cs
	Rock/Util/JobService.cs