Merge branch 'develop'

Some fixes for Fedora 20. Thanks to Steffen Bollman.
Add ChangeLog
Mention X11RDP-o-Matic in README
Merge branch 'master' into develop