Merge pybossa-default-them into uploads-branch