Merge branch 'master' of https://github.com/ralphmoser/xySite
Merge remote-tracking branch 'github/master'
- css adaptive seems improved
Merge branch 'develop'