format changes
Merge branch 'master'

Conflicts:
	OS_process/nbproject/project.properties
	OS_process/src/runtime/OS_output.java