Add a map for displayingId and databaseId
Merge branch 'dbmanager'

Conflicts:
	src/Logic.java