ported development from forked template
added hours to locations model
Merge branch 'feature-post-type-updates' into develop