master/vendor refactoring
master

solved merge conflicts with feature/template_engine
master

deleted user dirs
master

changed .gitignore
refactoring

Zwischenstand