Aligned options descriptions
Fixed getHeuristicScoreFunction
Removed setup-config file from repository
Merge branch 'spop-proj'

Conflicts:
	SPOP/projekt/.gitignore