12/19
Merge remote-tracking branch 'origin/12/19'

Conflicts:
	Pages/Inventory_Overview.aspx
	Pages/Make_a_Request.aspx
	Pages/Manage.aspx