Added more LevelGen and Template updates
Merge branch 'master' into rogueElement