no message
Merge branch 'develop' of https://github.com/Vladislavch/LinkTables into develop

Conflicts:
	src/ru/lorik/MainController.java
	src/ru/lorik/Model.java