Added a short description and a link to our wiki
Merge remote-tracking branch 'upstream/master' into appframe