Merge origin/master

Conflicts:
	src/main/resources/conf/createTable.sql