Merge origin/master

Conflicts:
	src/conf/tables.sql
Merge origin/master

Conflicts:
	src/conf/tables.sql