Deleted unused imports. Formated all logs messages with parameters for
logger slf4j, changed version of slf4j in pom.xml to the last.
changed configuration files
Resolving conflicts
Removed errors in AdminController
Merge branch 'master' of https://github.com/nromanen/Ch-023 into omandtc_regleader
Updated layout and js validator for edit leader form