ASWI - Pokročilé softwarové inženýrství » ASWI 2017 » Platforma na správu dotazníků (FAV) - Problem Solvers

Merge branch 'desktop_app2' into develop2

1. Conflicts:
2. .gitignore
3. desktop_app/gui/bin/.gitignore
4. desktop_app/gui/resources/json/Questionaires.json
5. desktop_app/gui/resources/json/getQuestionnaireDesktop.json
6. desktop_app/gui/resources/json/questionnaire.json
7. desktop_app/gui/src/controller/dialogWindow/NewQuestionnaireWindowController.java
8. desktop_app/gui/src/controller/dialogWindow/OptionsQuestionWindowController.java
9. desktop_app/gui/src/controller/dialogWindow/OptionsQuestionnaireWindowController.java
10. desktop_app/gui/src/controller/dialogWindow/OptionsSectionWindowController.java
11. desktop_app/gui/src/controller/popupMenu/ModulePopupMenuController.java
12. desktop_app/gui/src/controller/questionary/leftPane/QuestionnaireTreeController.java
13. desktop_app/gui/src/controller/questionary/rightPane/ModuleContentPaneController.java
14. desktop_app/gui/src/controller/questionary/rightPane/ModuleListPaneController.java
15. desktop_app/gui/src/enums/QuestionnaireState.java
16. desktop_app/gui/src/interfaces/ICommunicationManager.java
17. desktop_app/gui/src/interfaces/IModule.java
18. desktop_app/gui/src/model/BasicEntity.java
19. desktop_app/gui/src/model/Question.java
20. desktop_app/gui/src/model/Questionnaire.java
21. desktop_app/gui/src/model/QuestionnaireContainer.java
22. desktop_app/gui/src/model/Response.java
23. desktop_app/gui/src/model/Section.java
24. desktop_app/gui/src/model/leftPane/QuestionnaireTree.java
25. desktop_app/gui/src/model/leftPane/QuestionnaireTreeModel.java
26. desktop_app/gui/src/model/leftPane/QuestionnaireTreeRenderer.java
27. desktop_app/gui/src/model/module/Module.java
28. desktop_app/gui/src/model/module/answerModule/AnswerParent.java
29. desktop_app/gui/src/model/module/questionModule/QuestionParent.java
30. desktop_app/gui/src/model/module/questionModule/module/QuestionPictureModule.java
31. desktop_app/gui/src/model/module/questionModule/module/QuestionTextModule.java
32. desktop_app/gui/src/model/rightPane/ModuleListRenderer.java
33. desktop_app/gui/src/view/dialogWindow/NewQuestionWindow.java
34. desktop_app/gui/src/view/dialogWindow/NewSectionWindow.java
35. desktop_app/gui/src/view/leftPane/tabs/TabQuestionnaireTree.java
36. desktop_app/gui/src/view/rightPane/tabs/questionnaire/modulePane/ModuleListPane.java