Code refactoring
Merge branch 'develop' of https://github.com/WebTales/rubedo.git into develop