full conflict detection and improvement on traits' methods.


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