Some updates
Merge branch '2.0dev' of git@github.com:WebTales/rubedo.git into 2.0dev