改了一个主任务的bug，还有一个。。。
Merge branch 'master' of https://github.com/chshssky/GREWords

Conflicts:
	GreWords/GreWords/PresentationLayer/WordDetail/WordDetailViewController.m