Unity 4 upgrade

Upgraded project to Unity 4