Merge remote-tracking branch 'origin/develop'

Author: snipe

config/version.php

@@ -1,5 +1,5 @@
 <?php
 return array (
-  'app_version' => 'v3.0',
-  'hash_version' => 'v3.0-79-gfcb1d6a',
-);
+  'app_version' => 'v3.1',
+  'hash_version' => 'v3.1-84-g139325d',
+);