merge
Merge branch 'master' of https://github.com/gianitobia/ippocrate

Conflicts:
	CGIServer/.idea/workspace.xml