merge
Merge branch 'master' of https://github.com/martoriro/revalora-1-2014