some refactoring
Merge branch 'develop' of git@github.com:WebTales/rubedo.git into develop