Merge branch 'master' into backend-init
Merge branch 'backend-init'
image fix
Merge branch 'backend-init'
image fix 2
Merge branch 'master' into Front-End

Conflicts:
	wp-content/themes/hb/info/info.php