Merge remote-tracking branch 'origin/master' into xeon_desktop

Conflicts:
	src/michael/findata/FinDataExtractor.java
	src/michael/findata/external/shse/test/SHSEReportPublicationDataTest.java
	src/michael/findata/external/szse/SZSEReportPublication.java
	src/michael/findata/external/szse/test/SZSEReportPublicationDataTest.java
	src/michael/findata/resource/init.properties