closes WebTales/rubedo#296
Merge branch 'develop' of github.com:WebTales/rubedo into develop