Merge branch 'master' into projekt
Template change:
Added some fun extensions
made it uppercase
Merged project changes
Merge branch 'master' into projekt