Merge branch 'master' into develop
removed unused script files
Added some tests and fixed update after loading error
Merge branch 'develop'