Merge branch 'master' of https://github.com/finmath/finmath-lib

Conflicts:
	src/main/java/net/finmath/time/businessdaycalendar/BusinessdayCalendarExcludingTARGETHolidays.java
	src/main/java6/net/finmath/time/businessdaycalendar/BusinessdayCalendarExcludingTARGETHolidays.java

git-svn-id: http://svn.finmath.net/finmath%20lib/trunk@881 48fcbb9e-5639-0410-8b25-842128a4905d
Merge branch 'master' of https://github.com/finmath/finmath-lib