Improve … everything?
Make bootstrap.php work again
Merge pull request #2 from owncloud/kondou_patch_1

Improve … everything?
Merge branch 'master' into websocket_at_hostname

Conflicts:
	README.md
	js/main.js