New version.
Merge branch 'devel' of github.com:shallem/LinkPublicAppServer into devel