Resolve conflict
Reduced lab2 is passing tests
Some code cleaning
Resolve conflict
Fix issues with legacy lab
Rename folders
Merge pull request #93 from kirill-kornyakov/javafx-cleanup

Javafx project cleanup