Template change:
Merge branch 'master' into bachelor
Merged project changes
Merge branch 'master' into bachelor