Merge branch 'bedprotov1'
The master branch is updated with the basic version usable for the deployment in September
Huge cleanup
Merge branch 'dev'
Switched to 1.0