Merge branch 'master' of github.com:geibi/pictureserve

Conflicts:
	pictureserve.js

Signed-off-by: Andreas Geibert <ageibert@cemico.de>
Merge branch 'master' of github.com:geibi/pictureserve