weorkspace commit
Merge branch 'master' of https://github.com/lpeancovschi/emed

Conflicts:
	.idea/workspace.xml