commit ui files
Merge branch 'activity' of https://github.com/Mitrais/mr-training into activity

Conflicts:
	target/classes/medirecords-rest-service.xml