Merge branch 'master' into login
submodule
edit from server
Merge branch 'master' of https://github.com/delai/cfy
edit form server
Merge branch 'master' into server