Merge branch 'master' of git@github.com:Datical/DaticalDB4CARA.git

Conflicts:
	dist/DaticalDB4CARA-1.0.42.jar
context support