database for server
Merge branch 'master' of https://github.com/ffhs/privatecloud

Conflicts:
	PrivateCloudFFHS/src/ch/ffhs/privatecloudffhs/list/ServerListAdapter.java
server database act