Fix merge conflicts
Fix merge conflicts

geotagx/pybossa,stefanhahmann/pybossa,CulturePlex/pybossa,geotagx/geotagx-pybossa-archive,harihpr/tweetclickers,Scifabric/pybossa,harihpr/tweetclickers,CulturePlex/pybossa,Scifabric/pybossa,jean/pybossa,geotagx/geotagx-pybossa-archive,OpenNewsLabs/pybossa,geotagx/geotagx-pybossa-archive,inteligencia-coletiva-lsd/pybossa,stefanhahmann/pybossa,proyectos-analizo-info/pybossa-analizo-info,geotagx/geotagx-pybossa-archive,geotagx/pybossa,inteligencia-coletiva-lsd/pybossa,PyBossa/pybossa,jean/pybossa,proyectos-analizo-info/pybossa-analizo-info,CulturePlex/pybossa,proyectos-analizo-info/pybossa-analizo-info,PyBossa/pybossa,OpenNewsLabs/pybossa,geotagx/geotagx-pybossa-archive