Added vendor/ to ignored.
Added a few more composer files to be ignored.
Renamed Return button to Cancel.

Updated translations.
Merge branch 'master' into facebooksdk4

Conflicts:
	.gitignore
	i18n/en_GB.UTF-8/LC_MESSAGES/teke.mo
	i18n/en_GB.UTF-8/LC_MESSAGES/teke.po
	i18n/et_EE.UTF-8/LC_MESSAGES/teke.mo
	i18n/et_EE.UTF-8/LC_MESSAGES/teke.po
	i18n/fi_FI.UTF-8/LC_MESSAGES/teke.mo
	i18n/fi_FI.UTF-8/LC_MESSAGES/teke.po
	i18n/ru_RU.UTF-8/LC_MESSAGES/teke.mo
	i18n/ru_RU.UTF-8/LC_MESSAGES/teke.po
	i18n/sv_SE.UTF-8/LC_MESSAGES/teke.mo
	i18n/sv_SE.UTF-8/LC_MESSAGES/teke.po
	i18n/teke.pot

Appepted most of the changes from master.