m2
Merge branch 'mergetest2' into mergetest1

Conflicts:
	vm_branch_file
fixed conflict
init