DatabaseItem added in UML and code
Merge branch 'master' of https://github.com/pb593/PSIR

Conflicts:
	design/uml/server_side.dia