alot......
Merge branch 'DEMO2' of https://github.com/IF048JAVA/SoftTour into DEMO2