optimize

optimize
Merge branch 'master' of https://github.com/pisces/w3bridge

Conflicts:

w3bridge/w3bridge.xcodeproj/project.xcworkspace/xcuserdata/pisces.xcuser
datad/UserInterfaceState.xcuserstate
	w3bridge/w3bridge/Classes/SimpleBridgeWebViewController.h