BugFix for "#960 FileNotFoundException in Journal abbreviations window"
Fix for Globals.lang call
Merge branch 'master' of https://github.com/IngvarJackal/jabref into IngvarJackal-master

Conflicts:
	src/main/resources/resource/JabRef_da.properties
	src/main/resources/resource/JabRef_de.properties
	src/main/resources/resource/JabRef_en.properties
	src/main/resources/resource/JabRef_es.properties
	src/main/resources/resource/JabRef_fr.properties
	src/main/resources/resource/JabRef_in.properties
	src/main/resources/resource/JabRef_it.properties
	src/main/resources/resource/JabRef_ja.properties
	src/main/resources/resource/JabRef_nl.properties
	src/main/resources/resource/JabRef_no.properties
	src/main/resources/resource/JabRef_pt_BR.properties
	src/main/resources/resource/JabRef_ru.properties
	src/main/resources/resource/JabRef_tr.properties
	src/main/resources/resource/JabRef_vi.properties
	src/main/resources/resource/JabRef_zh.properties