Fleet Report
Merge branch 'dev2' of https://github.com/Innostark/Cares into dev2

Conflicts:
	Cares.Web/Cares.Web.csproj
Fleet report
Merge branch 'dev2' of https://github.com/Innostark/Cares into dev2

Conflicts:
	Implementation/TypeRegistrations.cs