r3347

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


git-svn-id: http://umple.googlecode.com/svn/trunk@3352 6ebf9d09-8eb1-0036-9d08-68c07d1b990a
Backing out changes to traits and messed up system. Hopefully restoring sane build


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