fix keyboard issue
Merge branch 'master' of https://github.com/fandg/family

Conflicts:
	family/res/layout/main.xml