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