resolved merge conflict
Rename Andreas' Template DB script due to conflict with master