Merge origin/master

Conflicts:
	SQL/DB.sql
	index.php
Merge origin/master
Merge origin/master
Merge origin/master

Conflicts:
	SQL/DB.sql
	index.php
Merge origin/master