merge
Merge branch 'master' of https://github.com/bingdow/foxCam

Conflicts:
	yaml/add-ons/accessible-tabs/jquery.tabs.js
	yaml/core/js/yaml-focusfix.js