Merge branch 'release/0.0.52' into develop
Merge branch 'hotfix/templatebug' into develop
Merge branch 'hotfix/templatebug2' into develop
Okay will this fix that jquery thing?
Merge branch 'develop'