Line Endings on Linux
General House Cleaning
Merge branch 'development' into feature--US787

Conflicts:
	MinistryPlatform.Translation/MinistryPlatform.Translation.csproj
	MinistryPlatform.Translation/Properties/AssemblyInfo.cs
	MinistryPlatform.Translation/Service References/PlatformService/Reference.cs
	MinistryPlatform.Translation/Service References/PlatformService/Reference.svcmap
	MinistryPlatform.Translation/app.config
	MinistryPlatform.Translation/packages.config
	crds-angular.sln
	crds-angular.test/controllers/HomeController.cs
	crds-angular.test/crds-angular.test.csproj
	crds-angular.test/packages.config
	crds-angular/Controllers/API/LookupController.cs
	crds-angular/Controllers/API/ProfileController.cs
	crds-angular/Controllers/HomeController.cs
	crds-angular/Services/TranslationService.cs
	crds-angular/Web.config
	crds-angular/app/crossroads.net/routes.js
	crds-angular/crds-angular.csproj
Merging
Finished Writing unit tests for the profile controller
angular fixes
Merge branch 'development' into US795

Conflicts:
	crds-angular.test/controllers/ProfileControllerTest.cs
	crds-angular/Scripts/_references.js
	crds-angular/app/modules/profile/profile_controller.js
	crds-angular/app/modules/profile/profile_directive.js
	crds-angular/app/modules/profile/profile_lookup_service.js
	crds-angular/crds-angular.csproj
Merge branch 'development' of https://github.com/crdschurch/crds-angular into US795

Conflicts:
	MinistryPlatform.Translation/app.config
Fixed marital status typo