build
Merge commit '4766e40b2082fb0316d4456e5483965be930f6d9' into staging
Merge branch 'master' into staging
Merge remote-tracking branch 'origin/master' into staging
Merge branch 'master' into staging
Merge branch 'staging' of https://github.com/WadeOne/EasyTeach into staging
Hot fix to allow deployment
Merge remote-tracking branch 'origin/master' into staging
Merge branch 'staging' of https://github.com/WadeOne/EasyTeach into staging

Conflicts:
	EasyTeach.Core.Tests/Services/Claim/Impl/ClaimServiceTest.cs
Merge branch 'master' into staging
Merge branch 'staging' of https://github.com/WadeOne/EasyTeach into staging
Merge branch 'master' into staging
Minor fix
Minor fix
Started implementing assigning
Merge branch 'master' of https://github.com/WadeOne/EasyTeach