Merge branch 'master' of github.com:alabs/oigame
Merge branch 'dentera'
Merge branch 'master' of github.com:alabs/oigame
resque stop start
home: youtube video mejorado
Merge branch 'master' of github.com:alabs/oigame
[prensa] storify
Merge branch 'press' into staging