Updating Category form and translations
Merge branch 'master' of https://github.com/inteligencia-coletiva-lsd/pybossa

Conflicts:
	pybossa/translations/pt/LC_MESSAGES/messages.mo
	pybossa/translations/pt/LC_MESSAGES/messages.po