Merge origin/master into HEAD

Conflicts:
	includes/db.class.php
	index.php
Merge origin/master into HEAD

Conflicts:
	includes/db.class.php
	index.php