Merge branch 'development'
Fixed skins outside of theme directory
Fixed static function issue
Merge branch 'master' into development
Removed unwanted files, updated twig functions