New templates
Merge branch 'feature-better_memes' into develop
Merge branch 'develop'