Merge origin/master

Conflicts:
	config.properties