Merge branch 'develop' into MySQL5.7

author Alexandre Alapetite <alexandre@alapetite.fr>

Sun, 16 Apr 2017 13:16:58 +0000 (15:16 +0200)

committer Alexandre Alapetite <alexandre@alapetite.fr>

Sun, 16 Apr 2017 13:16:58 +0000 (15:16 +0200)
author Alexandre Alapetite <alexandre@alapetite.fr>
Sun, 16 Apr 2017 13:16:58 +0000 (15:16 +0200)
committer Alexandre Alapetite <alexandre@alapetite.fr>
Sun, 16 Apr 2017 13:16:58 +0000 (15:16 +0200)
diff --cc database.sql
Simple merge
diff --cc include/dbstructure.php
Simple merge
author	Alexandre Alapetite <alexandre@alapetite.fr>
	Sun, 16 Apr 2017 13:16:58 +0000 (15:16 +0200)
committer	Alexandre Alapetite <alexandre@alapetite.fr>
	Sun, 16 Apr 2017 13:16:58 +0000 (15:16 +0200)
		1	2
database.sql	patch \|	diff1 \|	diff2 \|	blob \| history
include/dbstructure.php	patch \|	diff1 \|	diff2 \|	blob \| history