merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	de.pellepelster.myadmin.server.test/src/de/pellepelster/myadmin/server/test/RestUtilTest.java
gson for rest & simple vo lists