some fixes.
i do not know
fixed merge conflicts.
Merge branch 'master' of github.com:roland-wilhelm/eds
Merge branch 'master' of github.com:roland-wilhelm/eds
runable project uvproj.