Merge branch 'develop'
xml documentation
XML Documenation Updates
Merge branch 'develop'
XML Documentation updates
XML Documentation update
XML Documentation updates
Merge branch 'develop'
XML Documentation
XML Documentation updates
XML Doumentation
XML Documentation
Merge branch 'develop'

Conflicts:
	Rock/Model/PersonService.Partial.cs
XML Documentation updates
Xml documentation updates
XML Documentation Updates
Merge branch 'develop'

Conflicts:
	Rock/Model/DeviceService.Partial.cs
	Rock/Model/EntityTypeService.Partial.cs
	Rock/Model/GroupMember.cs
	Rock/Model/GroupMemberService.Partial.cs
	Rock/Model/Person.cs
	Rock/Model/PersonMergedService.Partial.cs
	Rock/Model/UserLogin.cs
XML Documentation
Merge branch 'develop'

Conflicts:
	Rock/Model/PersonService.Partial.cs
Merge branch 'develop'