Merge branch 'master' into develop

- Updated new develop version label
- Incremented database build number

diff --cc VERSION
index 52b0d2a456fca605fbb1f95c701b47afd88166b6,41df8e6ae67dfcfd8fbc0ffb4f8bbaf60b8f9bd3..607ef5eb6ac67ed654ae7253ffdaa265496e986d
--- 1/VERSION
--- 2/VERSION
+++ b/VERSION
@@@ -1,1 -1,1 +1,1 @@@
- 2018-05-dev
 -2018.05
++2018.08-dev

diff --cc boot.php
index 9963878c225c8861f719c65543bbb38db7351fb4,8f077b440db967a0f9e55036b83a0ac451f81841..57176296e450b0c92af1a58e10d24f0227141497
--- 1/boot.php
--- 2/boot.php
+++ b/boot.php
@@@ -39,9 -39,9 +39,9 @@@ require_once 'include/text.php'
  
  define('FRIENDICA_PLATFORM',     'Friendica');
  define('FRIENDICA_CODENAME',     'The Tazmans Flax-lily');
- define('FRIENDICA_VERSION',      '2018-05-dev');
 -define('FRIENDICA_VERSION',      '2018.05');
++define('FRIENDICA_VERSION',      '2018.08-dev');
  define('DFRN_PROTOCOL_VERSION',  '2.23');
- define('DB_UPDATE_VERSION',      1260);
 -define('DB_UPDATE_VERSION',      1266);
++define('DB_UPDATE_VERSION',      1267);
  define('NEW_UPDATE_ROUTINE_VERSION', 1170);
  
  /**

diff --cc database.sql
index cb47410e9cbd6f30d62686e707e3a06a4df853b8,ce5befc863557eec40b88d40c44342b87fb8ce67..cc6ab16e1dc8d25f200d9b8b83df18cdb2b36551
--- 1/database.sql
--- 2/database.sql
+++ b/database.sql
@@@ -1,6 -1,6 +1,6 @@@
  -- ------------------------------------------
- -- Friendica 2018-05-dev (The Tazmans Flax-lily)
- -- DB_UPDATE_VERSION 1260
 --- Friendica 2018.05 (The Tazmans Flax-lily)
 --- DB_UPDATE_VERSION 1266
++-- Friendica 2018.08-dev (The Tazmans Flax-lily)
++-- DB_UPDATE_VERSION 1267
  -- ------------------------------------------
  
  

diff --cc doc/Home.md
Simple merge

diff --cc doc/de/Home.md
Simple merge

diff --cc include/api.php
Simple merge

diff --cc include/conversation.php
Simple merge

diff --cc include/dba.php
Simple merge

diff --cc include/items.php
Simple merge

diff --cc include/text.php
Simple merge

diff --cc mod/admin.php
Simple merge

diff --cc mod/events.php
Simple merge

diff --cc mod/photos.php
Simple merge

diff --cc src/Core/Worker.php
Simple merge

diff --cc src/Database/DBStructure.php
Simple merge

diff --cc src/Model/Item.php
Simple merge

diff --cc src/Protocol/DFRN.php
Simple merge

diff --cc src/Protocol/OStatus.php
Simple merge

diff --cc src/Protocol/PortableContact.php
Simple merge