Merge branch 'master' of https://github.com/entheme/cmu2014-warehouse

Conflicts:
	src/com/lge/warehouse/manager/WarehouseManagerController.java
Merge branch 'master' of https://github.com/entheme/cmu2014-warehouse

Conflicts:
	src/com/lge/warehouse/manager/WarehouseManagerController.java
Merge branch 'master' of https://github.com/entheme/cmu2014-warehouse