123
Merge branch 'master' of https://github.com/phrong-x/git_ihome.git

Conflicts:
	loves_family/loves_family/bin/dexedLibs/android-support-v4-65192dc9dc0d5bc640edeeecf10ce2ac.jar
	loves_family/loves_family/bin/loves_family.apk
	loves_family/loves_family/bin/resources.ap_