allowing configuration of client app directory
small server event fix
Merge branch 'master' into diff

Conflicts:
	src/common/storage/server.js