* bugfixes
* merge conflicts
* documentation
Merge branch 'master' of https://github.com/dfyx/lego-team7