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

Conflicts:
	.idea/workspace.xml
Merge remote-tracking branch 'origin/develop-JK' into develop-SN
Merge remote-tracking branch 'origin/develop-JK' into develop-SN
WIP android app / openGL