some changes on top
Merge branch 'master' of https://github.com/kriegaex/training-portal
some changes on top