client online search ok
????
Merge branch 'dev' of https://github.com/plumer/diki into dev

Conflicts:
	lab02/Database.java
deal with conflict