Merge branch 'development' of C:\Users\stanislav.sobolev\Desktop\Software\JAVA\labs-questionnaire-template-2 with conflicts.
Merge remote-tracking branch 'origin/development' into development
Merge remote-tracking branch 'origin/development' into development

Conflicts:
	src/main/java/com/engagepoint/controller/SessionController.java
Merge remote-tracking branch 'origin/development' into development

Conflicts:
	src/main/java/com/engagepoint/controller/SessionController.java
Merge remote-tracking branch 'origin/development' into development

Conflicts:
	src/main/java/com/engagepoint/controller/SessionController.java
Merge remote-tracking branch 'origin/development' into development

Conflicts:
	src/main/java/com/engagepoint/controller/SessionController.java