Fixing situation where the master templates had not been modified and the copied templates had beenmodified instead, and then there was overwriting of earlier changes


git-svn-id: http://umple.googlecode.com/svn/trunk@3017 6ebf9d09-8eb1-0036-9d08-68c07d1b990a