20140624 wf
Merge branch 'master' of https://github.com/wf1768/archive_new

Conflicts:
	src/resources/档案未完成的工作.xls