upgrading unity project to 4.0
merge upgrade