WP Theme cleanup and changes
Merge branch 'develop' into wp-theme-cleanup
Merge branch 'wp-theme-cleanup' into develop