edit Symptome
Merge branch 'master' of https://github.com/epha/consilium

Conflicts:
	code/entities.js