Updated version to v17
Fixed code style in the templates
Improved templates variables
Merge branch 'master' into feature-nameless4