Merge branch 'master' into lb

Conflicts:
	Demo/SVWeb.xcodeproj/project.pbxproj
	SVWebViewController/SVWebViewController.bundle/iPad/action@2x.png
	SVWebViewController/SVWebViewController.bundle/iPad/back@2x.png
	SVWebViewController/SVWebViewController.bundle/iPad/forward@2x.png
	SVWebViewController/SVWebViewController.bundle/iPad/refresh@2x.png
	SVWebViewController/SVWebViewController.bundle/iPad/stop@2x.png
	SVWebViewController/SVWebViewController.h
	SVWebViewController/SVWebViewController.m