Implement the register function of OC\ContactsManager
$key is not needed for registering contactsmanager callbacks
Supply the contactsmanager object to the callbacks
Also encode > and '
camelCase vars in OC\ContactsManager
Merge branch 'master' into contactsmanager-register

Conflicts:
	lib/private/contactsmanager.php
Fix wrong var name
columns should be nullable by default
Add CSRF check on login and logout
This is a minor issue and not worth a backport in my opinion as it could break more things than it's worth having it.
Cleanup code a little bit

- Use OCP\Response constants instead of the HTTP error code
- Use checkAppEnabled() instead of OC_App::isEnabled with an if statement
- Remove uneeded variable $baseURL
- Rename $isvalid to $isValid
Add missing \
Check if ReflectionMethod::getDocComment is working
adopt new settings style
 Redirect to index if the logout link is accessed without valid session

This is needed to prevent "Token expired" messages while login if a session is expired
@see https://github.com/owncloud/core/pull/8443#issuecomment-42425583
Add a resetadminpass command to console - fix #8248
Make ResetAdminPass to ResetPassword
Back to the future
Add doc, check return-value, fix spacing, require interactive
Merge branch 'master' into csrf-on-login-and-logout

Conflicts:
	core/templates/login.php
Merge branch 'master' into cleanup-list-code

Conflicts:
	apps/files_sharing/ajax/list.php