cleanup
Merge branch 'master' of github.com:christophehurpeau/Springbok-Webmanager