Merge branch 'master' into McNetic-zipstreamer

.gitignore

3rdparty

apps/files/css/files.css

apps/files/templates/index.php

apps/files_external/lib/config.php

apps/files_external/tests/mountconfig.php

apps/files_sharing/lib/cache.php

apps/files_sharing/tests/cache.php

config/config.sample.php

core/css/icons.css

core/js/js.js

core/js/oc-dialogs.js

core/js/tags.js

core/minimizer.php

core/routes.php

lib/base.php

lib/private/app.php

lib/private/minimizer.php

lib/private/minimizer/css.php

lib/private/minimizer/js.php