remove some resources
remove some obj files..
update
various fixes
Merge branch 'master' into cleanup