more refactoring of training district content,  duplication is removed and methods are extracted
training district is now split up well
Merge commit '88dd548176ea3fdb5f3db02a7a5aa3fa64a00d10' into production