Merge branch 'master' into develop
Boilerplate changed
Fixing templating
tuktuk support
RequireJS enhancement
Deleted unused templates