minor fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	config_file
	src/taskaler/configurations/Configuration.java