Merge branch 'dev' of https://github.com/tambaqui/Tandem into tambaqui-dev

Conflicts:
	src/languages/ca_ES/LC_MESSAGES/messages.mo
	src/languages/ca_ES/LC_MESSAGES/messages.po
	src/languages/en_US/LC_MESSAGES/messages.mo
	src/languages/en_US/LC_MESSAGES/messages.po
	src/languages/es_ES/LC_MESSAGES/messages.mo
	src/languages/es_ES/LC_MESSAGES/messages.po