Merge remote-tracking branch 'origin/develop'

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

# Conflicts:
#	config/version.php

Author: snipe

config/version.php

@@ -1,10 +1,10 @@
 <?php
 return array (
-  'app_version' => 'v7.0.0',
-  'full_app_version' => 'v7.0.0 - build 13553-g9fccafa3a',
+  'app_version' => 'v7.0.1',
+  'full_app_version' => 'v7.0.1 - build 13553-g9fccafa3a',
   'build_version' => '13553',
   'prerelease_version' => '',
   'hash_version' => 'g9fccafa3a',
-  'full_hash' => 'v7.0.0-51-g9fccafa3a',
+  'full_hash' => 'v7.0.1-51-g9fccafa3a',
   'branch' => 'master',
 );