improved names
updated workspace
Merge branch 'master' of https://github.com/pureal-code/pureal-os

Conflicts:
	.idea/workspace.xml