Added a new edge case template

Added a template that has all other edge case templates as bases
Merge remote-tracking branch 'origin/master' into Glass-Mapper