Bugfix and deletion of unused methods.
Some minor changes.
Resolve conflict.
Merge remote-tracking branch 'origin/master'

Conflicts:
	.classpath
	virtual disk.vd
Merge remote-tracking branch 'origin/master'