Merge branch 'master' into backend-init
Merge branch 'master' into backend-init
Merge branch 'Static'
Merge branch 'master' into backend-init
Fixed State Issues with JS info popup
Merge branch 'backend-init'
Merge branch 'master' of https://github.com/work-shop/hb
Conflict resolved

Conflicts:
	wp-content/themes/hb/_/js/functions.js