16:40PM, 8th JAN
Merge branch 'guocheng'

Conflicts:
	src/com/neutronstar/neutron/MainTabFamily.java
	src/com/neutronstar/neutron/MainTabToday.java
	src/com/neutronstar/neutron/UserInfoActivity.java
	src/com/neutronstar/neutron/model/FamilyMemberEntity.java