Merge current PyBossa

Will not work (for sure)