Merge branch 'hotfix-1' into develop
add templates
completely remake MVC
Merge branch 'develop'