NRT Type all done
Merge branch 'dev2' of https://github.com/Innostark/Cares into dev2

Conflicts:
	Cares.Web/Content/MainSite.css.map
	Cares.Web/Content/MainSite.min.css