changing manage item naming scheme
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
Merge branch 'login' of https://github.com/liammaier/fitbitConnector into login
merge