Merge pull request #12 from tpokorra/master

a couple of changes for the development environment, and serveradminconsole improvements