Merge branch 'master' into development
Removed unwanted files, updated twig functions
Merge branch 'development'