Fixed "hanged" tomcat after shutdown
Merge branch 'kolais' into develop