diff --git a/.appveyor.yml b/.appveyor.yml
index 681dfa94698e4..c63d855a4e7f6 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -34,6 +34,19 @@ install:
# Get the MSSQL DLL's
- ps: >-
If ($env:PHP -eq "1") {
+<<<<<<< HEAD
+=======
+ If ($env:php_ver_target -eq "5.6") {
+ $source = "https://cdn.joomla.org/ci/php-sqlsrv.zip"
+ $destination = "c:\tools\php\php-sqlsrv.zip"
+ Invoke-WebRequest $source -OutFile $destination
+ #appveyor-retry appveyor DownloadFile https://cdn.joomla.org/ci/php-sqlsrv.zip
+ 7z x -y php-sqlsrv.zip > $null
+ copy SQLSRV\php_sqlsrv_56_nts.dll ext\php_sqlsrv_nts.dll
+ copy SQLSRV\php_pdo_sqlsrv_56_nts.dll ext\php_pdo_sqlsrv_nts.dll
+ Remove-Item C:\tools\php\* -include .zip
+ } Else {
+>>>>>>> staging
$DLLVersion = "4.3.0"
cd c:\tools\php\ext
$source = "http://windows.php.net/downloads/pecl/releases/sqlsrv/$($DLLVersion)/php_sqlsrv-$($DLLVersion)-$($env:php_ver_target)-nts-vc14-x64.zip"
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
new file mode 100644
index 0000000000000..3af433d8336f1
--- /dev/null
+++ b/.github/CODEOWNERS
@@ -0,0 +1,60 @@
+# Custom Fields
+administrator/components/com_fields/* @laoneo
+components/com_fields/* @laoneo
+plugins/content/fields/* @laoneo
+plugins/editors-xtd/fields/* @laoneo
+plugins/fields/* @laoneo
+plugins/systems/fields/* @laoneo
+
+# Smart Search
+administrator/components/com_finder/* @mbabker
+components/com_finder/* @mbabker
+modules/mod_finder/* @mbabker
+plugins/content/finder/* @mbabker
+plugins/finder/* @mbabker
+
+# Language strings
+administrator/language/en-GB/* @brianteeman
+installation/language/en-GB/* @brianteeman
+language/en-GB/* @brianteeman
+README.md @brianteeman
+README.txt @brianteeman
+
+# CodeMirror
+media/editors/codemirror/* @okonomiyaki3000
+plugins/editors/codemirror/* @okonomiyaki3000
+
+# Statistics Server
+plugins/system/stats/* @mbabker @wilsonge
+
+# Release Tools
+build.xml @mbabker
+build/build.php @mbabker @rdeutz @wilsonge
+build/bump.php @mbabker @rdeutz @wilsonge
+build/deleted_file_check.php @mbabker @rdeutz @wilsonge
+
+# Core/Extension Install/Update Tools
+administrator/components/com_joomlaupdate/* @mbabker @rdeutz @wilsonge @zero-24
+libraries/src/Installer/* @mbabker @rdeutz @wilsonge @zero-24
+libraries/src/Updater/* @mbabker @rdeutz @wilsonge @zero-24
+
+# Automated Testing
+build/jenkins/* @mbabker @rdeutz
+build/travis/* @mbabker @rdeutz
+tests/codeception/* @rdeutz
+tests/javascript/* @dgt41 @rdeutz
+tests/unit/* @mbabker @rdeutz
+.appveyor.yml @mbabker @rdeutz
+.drone.yml @rdeutz
+.hound.yml @mbabker
+.travis.yml @mbabker @rdeutz
+appveyor-phpunit.xml @mbabker @rdeutz
+codeception.yml @rdeutz
+karma.conf.js @dgt41 @rdeutz
+phpunit.xml.dist @mbabker @rdeutz
+RoboFile.dist.ini @rdeutz
+RoboFile.php @rdeutz
+travis-phpunit.xml @mbabker @rdeutz
+
+# Core JS
+media/*/js/* @dgt41
diff --git a/.github/ISSUE_TEMPLATE/Bug_report.md b/.github/ISSUE_TEMPLATE/Bug_report.md
new file mode 100644
index 0000000000000..f234699b23618
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/Bug_report.md
@@ -0,0 +1,23 @@
+---
+name: Bug report
+about: Create a report to help us improve
+
+---
+
+### Steps to reproduce the issue
+
+
+
+### Expected result
+
+
+
+### Actual result
+
+
+
+### System information (as much as possible)
+
+
+
+### Additional comments
diff --git a/.github/ISSUE_TEMPLATE/Custom.md b/.github/ISSUE_TEMPLATE/Custom.md
new file mode 100644
index 0000000000000..1c32a221edc25
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/Custom.md
@@ -0,0 +1,16 @@
+---
+name: Fix this template
+about: Suggest a fix it
+
+---
+
+### What needs to be fixed
+
+
+### Why this should be fixed
+
+
+### How would you fix it
+
+
+### Side Effects expected
diff --git a/.github/ISSUE_TEMPLATE/Feature_request.md b/.github/ISSUE_TEMPLATE/Feature_request.md
new file mode 100644
index 0000000000000..e853c4610a791
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/Feature_request.md
@@ -0,0 +1,15 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+
+---
+
+### Is your feature request related to a problem? Please describe.
+
+
+
+### Describe the solution you'd like
+
+
+
+### Additional context
diff --git a/README.md b/README.md
index 60fcfcd128c51..042332ea30017 100644
--- a/README.md
+++ b/README.md
@@ -3,13 +3,9 @@ Joomla! CMS™ [![Analytics](https://ga-beacon.appspot.com/UA-544070-3/joomla-cm
Build Status
---------------------
-Travis-CI: [![Build Status](https://travis-ci.org/joomla/joomla-cms.svg?branch=staging)](https://travis-ci.org/joomla/joomla-cms)
-
-Drone -CI: [![Build Status](http://213.160.72.75/api/badges/joomla/joomla-cms/status.svg)](http://213.160.72.75/joomla/joomla-cms)
-
-AppVeyor: [![Build status](https://ci.appveyor.com/api/projects/status/bpcxulw6nnxlv8kb/branch/staging?svg=true)](https://ci.appveyor.com/project/joomla/joomla-cms)
-
-Jenkins: [![Build Status](http://build.joomla.org/job/cms/badge/icon)](http://build.joomla.org/job/cms/)
+| Travis-CI | Drone-CI | AppVeyor | Jenkins |
+| ------------- | ------------- | ------------- | ------------- |
+| [![Build Status](https://travis-ci.org/joomla/joomla-cms.svg?branch=staging)](https://travis-ci.org/joomla/joomla-cms) | [![Build Status](http://213.160.72.75/api/badges/joomla/joomla-cms/status.svg)](http://213.160.72.75/joomla/joomla-cms) | [![Build status](https://ci.appveyor.com/api/projects/status/bpcxulw6nnxlv8kb/branch/staging?svg=true)](https://ci.appveyor.com/project/joomla/joomla-cms) | [![Build Status](http://build.joomla.org/job/cms/badge/icon)](http://build.joomla.org/job/cms/) |
What is this?
---------------------
@@ -91,7 +87,7 @@ Do you want to improve Joomla?
Copyright
---------------------
-* Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved.
+* Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
* [Special Thanks](https://docs.joomla.org/Special:MyLanguage/Joomla!_Credits_and_Thanks)
* Distributed under the GNU General Public License version 2 or later
* See [License details](https://docs.joomla.org/Special:MyLanguage/Joomla_Licenses)
diff --git a/README.txt b/README.txt
index 0153d6173b2d9..006fedcd41833 100644
--- a/README.txt
+++ b/README.txt
@@ -67,7 +67,7 @@
* Documentation for Web designers: https://docs.joomla.org/Special:MyLanguage/Web_designers
Copyright:
- * Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved.
+ * Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
* Special Thanks: https://docs.joomla.org/Special:MyLanguage/Joomla!_Credits_and_Thanks
* Distributed under the GNU General Public License version 2 or later
* See Licenses details at https://docs.joomla.org/Special:MyLanguage/Joomla_Licenses
diff --git a/RoboFile.php b/RoboFile.php
index bd0a5ba6cb1cd..8754e212e8c05 100644
--- a/RoboFile.php
+++ b/RoboFile.php
@@ -3,7 +3,7 @@
* @package Joomla.Site
* @subpackage RoboFile
*
- * @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @copyright Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
diff --git a/SECURITY.md b/SECURITY.md
new file mode 100644
index 0000000000000..449c2a5978fdd
--- /dev/null
+++ b/SECURITY.md
@@ -0,0 +1,39 @@
+# Security Policies and Procedures
+
+This document outlines security procedures and policies for the `Joomla! Project`.
+
+ * [Reporting a Bug](#reporting-a-bug)
+ * [Response Handling](#response-handling)
+ * [Security Announcement Policy](#security-announcement-policy)
+ * [Further Details on the Joomla! Security Policies](https://security.joomla.org)
+
+## Reporting a Bug
+
+The `Joomla` team and community take all security bugs in `Joomla` seriously.
+
+The Joomla! Project takes security vulnerabilities very seriously. As such, the Joomla! Security Strike Team (JSST) oversees the project's security issues and follows some specific procedures when dealing with these issues.
+
+If you find a possible vulnerability, please report it to the JSST using the [online form](https://developer.joomla.org/security/contact-the-team.html) or via email at security@joomla.org
+
+We maintain a list of [GPG keys and addresses](https://developer.joomla.org/security/gpg-keys.html) for the security@joomla.org address and members of the JSST to allow signed and encrypted communications.
+
+To report an issue in a Joomla! extension, please submit it to the [Vulnerable Extensions List.](https://vel.joomla.org/submit-vel)
+
+For support with a site which has been attacked, please visit the [Joomla! Forum.](https://forum.joomla.org/viewforum.php?f=714)
+
+Thank you for improving the security of `Joomla`.
+
+## Response Handling
+
+The JSST aims to ensure all issues are handled in a timely manner and for clear communication between the team and issue reporters. As such, we have established the following guidelines for responding to issue reports:
+
+* Within 24 hours every report gets acknowledged
+* Within 7 days every report gets a further response stating either
+ * the issue is closed (and why)
+ * the issue is still under investigation; if needed, additional information will be requested
+* Within 21 days every report must be resolved unless there are exceptional circumstances requiring additional time
+
+## Security Announcement Policy
+* Verified vulnerabilities will only be publicly announced AFTER a release is issued which fixes the vulnerability.
+* All announcements will contain as much information as possible, but will NOT contain step-by-step instructions for the vulnerability.
+* The `Joomla! Project` will properly credit individuals and/or organizations who responsibly disclose security issues to the JSST. You can indicate the way you would like to be referred to in the advisory about the vulnerability. Our preference is to use full names. If you do not specify then we will use the contact name associated with the email address the report was received from. You can also request a pseudonym or having your name withheld.
diff --git a/administrator/components/com_admin/admin.php b/administrator/components/com_admin/admin.php
new file mode 100644
index 0000000000000..3e0986cdaeed3
--- /dev/null
+++ b/administrator/components/com_admin/admin.php
@@ -0,0 +1,17 @@
+execute(JFactory::getApplication()->input->get('task'));
+$controller->redirect();
diff --git a/administrator/components/com_admin/admin.xml b/administrator/components/com_admin/admin.xml
index 8d34fdb99a2e7..c964ee62448fa 100644
--- a/administrator/components/com_admin/admin.xml
+++ b/administrator/components/com_admin/admin.xml
@@ -3,7 +3,7 @@