Register
Merge remote-tracking branch 'origin/master'

Conflicts:
	proc_manager.py
	shell.py