Update Client + Admin
Merge branch 'master' of https://github.com/golden-illusion/C1111G-G4-SEM3

Conflicts:
	eProject/Insurance/Insurance/Migrations/Configuration.cs