Merge branch 'hotfix'
Added version number to enqueue style
Merge branch 'hotfix' into develop