multi_xml, omniauth-oauth2, devise and httparty updated
use the model method for delete campaigns
change delete for reject, for not persist changes
Merge branch 'develop'
Merge branch 'master' of github.com:alabs/oigame
README: update
Merge branch 'sidebar'
incidencia 207
#140 - grep -v grep :S
Merge branch '#140'
Merge branch 'master' of github.com:alabs/oigame
eliminadas # de los hastags
Merge branch 'master' of github.com:alabs/oigame
change users for people
normalize hashtag
merge to staging