widget fixes
deploy
deploy
fix
update
id fix
Merge branch 'staging'

Conflicts:
	functions.php
	scripts.php
deploy
fix
Merge branch 'master' into staging