Merge branch 'proto2' of https://github.com/kesl/khypervisor into proto2

Conflicts: MANUALLY RESOLVED
	monitor/hmain.c
Fix to build error:
       generic_timer.c undefined symbol reference to HVMM_TRACE_ENTER()/HVMM_TRACE_EXIT()
       due to missing hvmm_trace.h
Merge branch 'proto2' of https://github.com/simonkim/khypervisor into proto2