Few bugfixes
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/org/pikater/core/agents/system/computationDescriptionParser/Parser.java