removed some templates which were only added for testing in the first place
Merge remote-tracking branch 'origin/master'