"GUI Updates for all tabs"
Merge branch 'develop' of https://github.com/Jherrmann5/ABA into develop

Conflicts:
	app/scripts/controllers/homeController.js
	app/scripts/controllers/inventoryController.js