fix bug
Merge branch 'tablet' of github.com:76260865/LawGarden into tablet

Conflicts:
	src/src/com/jason/lawgarden/MyFavoriteFragment.java