Merge origin/master

Conflicts:
	database.sql
Merge origin/master