patch-JASON-572-CONFLICT_AUTO_GENERATED_SET_GET_METHODS_USER_METHODS_SAME_NAME


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