Merge branch 'master' into login
working on manage item
fixed sale manage item checkbox
Merge branch 'master' into login
working on manage item
bug fixes
Merge branch 'master' into login

Conflicts:
	build/classes/connect/GetUserBraceletsServlet.class
	build/classes/connect/UpdateUserServlet.class
	build/classes/store/GetItemsServlet.class
	build/classes/store/PurchaseItemServlet.class
	build/classes/store/UpdateUserItemServlet.class
Merge branch 'master' into login
Merge branch 'login'