connection test lisätty
Merge branch 'master' of github.com:ruoja/tsohaDivelog

Conflicts:
	divelog/target/divelog/META-INF/context.xml