added getUrlContent
Merge branch 'master' of github.com:owncloud/appframework into hook_api

Conflicts:
	core/api.php