change for myfind spec change(change password flow)
Merge branch 'master' of https://github.com/runyetech/find-android

Conflicts:
	res/values/strings.xml