couple bug fixes for login
jsp problems
changed back from jsp need to add user logic to main.js
finished the update servlet for items now for bug testing
merging
god help us
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