ужас
Merge branch 'master' of https://github.com/NightFantom/FellowTraveller.git

Conflicts:
	UserInterface/web/jsp/setRoute.jsp
Signed-off-by: NightFantom <Den1-1@mail.ru>
Merge branch 'master' of https://github.com/NightFantom/FellowTraveller.git
Signed-off-by: NightFantom <Den1-1@mail.ru>
Merge branch 'master' of https://github.com/NightFantom/FellowTraveller.git

Conflicts:
	UserInterface/web/addRouter.jsp
Signed-off-by: NightFantom <Den1-1@mail.ru>
Merge branch 'master' of https://github.com/NightFantom/FellowTraveller.git
добавлена возможность реконнекта к бд при простаивании больше 10 минут