Merge remote-tracking branch 'origin/develop'

Signed-off-by: snipe <[email protected]>

# Conflicts:
#	config/version.php
#	public/css/build/app.css
#	public/css/build/overrides.css
#	public/css/dist/all.css
#	public/css/dist/skins/_all-skins.css
#	public/css/dist/skins/_all-skins.min.css
#	public/css/dist/skins/skin-black-dark.css
#	public/css/dist/skins/skin-black-dark.min.css
#	public/css/dist/skins/skin-blue-dark.css
#	public/css/dist/skins/skin-blue-dark.min.css
#	public/css/dist/skins/skin-green-dark.css
#	public/css/dist/skins/skin-green-dark.min.css
#	public/css/dist/skins/skin-orange-dark.css
#	public/css/dist/skins/skin-orange-dark.min.css
#	public/css/dist/skins/skin-purple-dark.css
#	public/css/dist/skins/skin-purple-dark.min.css
#	public/css/dist/skins/skin-red-dark.css
#	public/css/dist/skins/skin-red-dark.min.css
#	public/css/dist/skins/skin-yellow-dark.css
#	public/css/dist/skins/skin-yellow-dark.min.css
#	public/mix-manifest.json

Author: snipe

config/version.php

@@ -1,10 +1,10 @@
 <?php
 return array (
-  'app_version' => 'v7.0.13',
-  'full_app_version' => 'v7.0.13 - build 15666-g03b01689b',
-  'build_version' => '15666',
+  'app_version' => 'v7.0.14-pre',
+  'full_app_version' => 'v7.0.14-pre - build 15942-g3bf33aa68',
+  'build_version' => '15942',
   'prerelease_version' => '',
-  'hash_version' => 'g03b01689b',
-  'full_hash' => 'v7.0.13-144-g03b01689b',
+  'hash_version' => 'g3bf33aa68',
+  'full_hash' => 'v7.0.14-pre-420-g3bf33aa68',
   'branch' => 'master',
 );