Merge origin/master

Conflicts:
	config.properties
Merge origin/master
Merge origin/master
Merge origin/master

Conflicts:
	config.properties
Merge origin/master
Merge origin/master