Signed-off-by: cluegwu <clue@gwu.edu>
Signed-off-by: cluegwu <clue@gwu.edu>
Merge http://github.com/george-gwu/Bookstore
Attempting to merge with George's master, and update Inventory forms.

Conflicts:
	application/configs/application.ini
	application/forms/Inventory.php
	application/modules/admin/controllers/InventoryController.php
	application/modules/default/views/scripts/index/index.phtml
	docs/README.txt