fix conflicts
fix merge conflicts
Add podspec
fix bug
add requires_arc
Merge branch 'master' of https://github.com/peyton/WebViewJavascriptBridge

Conflicts:
	WebViewJavascriptBridge_OSX/WebViewJavascriptBridge_OSX.m