Merge branch 'master' into Static
Info structure changes
Merge branch 'master' into Static
Merge branch 'backend-init'
Merge branch 'backend-init'
image fix 2
Merge branch 'master' into backend-init
Merge branch 'master' into Front-End

Conflicts:
	wp-content/themes/hb/info/info.php
Merge branch 'Front-End'
built grid -> gallery functionality
Merge branch 'master' into backend-init