Kdesk will combine generic .kdeskrc with user's settings

 o The default .kdeskrc file under /usr/share will be overriden
   by any settings found on your home directory's .kdeskrc file.
 o End user documentation updated on the wiki.
Merge pull request #35 from KanoComputing/mixed-configuration

Kdesk will combine generic .kdeskrc with user's settings