little refactorings
merge resolve
Merge branch 'master' of https://github.com/asenval/BoronTeamProject