Spreadsheet
Merge branch 'master' of github.com:xhuaqing/qt

Conflicts:
	stu/mainwindow.cpp
	stu/mainwindow.h
	stu/stu.qrc