Merge origin/master

Conflicts:
	OSS/src/oss/Process.java
create again process class