* use PHPUnit 4.x
* force php memory limit on travis to 1024MB
* create script for travis
* whitelist branches master, stable5 and stable6 on travis (and PRs)
* sqlplus64
* conditional JS tests and ocular temporal removal
* enable scrutinizer code coverage
* move oracle to top to decrease overall test duration

Fix undefined variable when uninstalling an app

close session right before the download starts - this enables parallel d...

Hack to avoid Agent DN + Password being overwritten by some ugly browsers with stored site credentials

Conflicts:
	apps/user_ldap/css/settings.css

Increase word wrap limit for emails to 78 characters

no top border for first settings item, detail enhancement

Fix 9969

Set group usercount to 0, not '', fixes #9782

Dont touch non-oc tables when doing the InnoDB repair step

typo fix from transifex suggestion

Remove old color of body

prevent PHP errors and enhance logging

Fixes #8326: deletion of directories on S3

* only visible in public view as ugly grey pane behind the footer

Quick fix for #9119. Increase preview to keep empty message more centered

Fixes for filepicker

traverse folders in php to search in shared files