fixed wrong functions' name
Merge branch 'login' of https://github.com/liammaier/fitbitConnector 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
manage item views show icon now
finished the user info view and model
testing servlet for manage item
merging
god help us