Second Commit from Tzu-Hsuan
second commit

Merge branch 'master' of https://github.com/thwei/VR

Conflicts:
	build/ui_mainwindow.h
	build/ui_transfer_func1d.h
	glwidget.cpp
third commit