database new method getUniqueID(String table)
Merge branch 'master' of https://github.com/flbaue/mars-pub

Conflicts:
	haw/SEReservation/.idea/workspace.xml
clean