Conflicts:

	lib/mail.php

lib/defaults.php should only contain the default strings and read the other strings directly from the theme

Conflicts:

	settings/templates/admin.php

enable testing individual tests

if rename of file fails, the rename is undone in the view - fix 2820

session life time is now configurable and set to the same value

Make rmdir recursive for local storage

gitignore: Make paths relative to repository root.

Cleanup OC_Setup 

Paths without the leading slash apply to all subdirectories, which especially
means that /tests/data is ignored, making it unnecessarily hard to add test
data.

Escape dropdown

Fixes #3241

Fix textfield label overlapping value.

upload_max_filesize = 0 not possible if post_max_size is not 0

Give apps the option to wrap storage backends

Convert OC_Log to object so it can be used for DI

for now we disable public upload in case encryption is enabled

Skip Test_Archive_TAR in php 5.5 for now

Fixing unittests master

Improvements for the static:// streamwrapper

Remove duplicate / for first folder in root