Moved templates back to data folder.
Having them in the save folder prevented some problems with carrying
over to new versions yes, but it was also incredibly annoying to use
templates if you also wanted to use the 'delete world on save' option.
Merge branch 'master' of https://github.com/TheDarklingWolf/Cataclysm-DDA