remove test code
Merge branch 'UI' of https://github.com/theifgun/ItemAdvisor into BridgeManager
more user info
Merge branch 'BridgeManager' into Dev

Conflicts:
	ItemAdvisor/ItemAdvisor/AppDelegate.m
Merge branch 'Dev' into UI