small changes
Merge branch 'master' of github.com:b-a-s-t-i/travel-log

Conflicts:
	database/test.h2.db
Bugfixes: timezone foobar