Merge pull request #2 from seetheprogress/master

various fixes
Merge https://github.com/LukasReschke/ownCloud-demo
Merge https://github.com/seetheprogress/ownCloud_demo
use correct variable