Merge branch 'master' into vacancy
Merge branch 'vacancy'
Initial build of editor templates back up
Daily backup of Alpha project to vacancy branch
Change type names
Revert controller changes for now, need to discuss reference data types
Merge branch 'master' of https://github.com/Valtech-NAS/Alpha into vacancy

Conflicts:
	Alpha/Nas.Employer.Web/Nas.Employer.Web.csproj
	Alpha/Nas.Employer.Web/Views/Shared/DisplayTemplates/Decimal.cshtml
Backup prior to merge
Merge branch 'master' of https://github.com/Valtech-NAS/Alpha
Merge branch 'master' into vacancy

Conflicts:
	Alpha/Nas.Employer.Web/Models/Common/WorkingWeekViewModel.cs
	Alpha/Nas.Employer.Web/Nas.Employer.Web.csproj
	Alpha/Nas.Employer.Web/Views/Role/Welcome.cshtml
First cut of Alpha with templates
First cut of Alpha with templates
Merge branch 'master' of https://github.com/Valtech-NAS/Alpha
Merge branch 'vacancy'