added physics asset
more changes
finish merge