Getting VM ready
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/vm/VirtualMachine.cpp
	src/vm/VirtualMachine.h