Merge branches 'elmellano' and 'master' of https://github.com/pbenav/eneboo-features into elmellano