解决了3.5inch 显示混乱的问题
Merge问题
Merge branch 'master' of https://github.com/chshssky/GREWords

Conflicts:
	GreWords/GreWords/DashboardViewController.m
	GreWords/GreWords/WordDetailViewController.xib