Merged changes
Merge branch 'master' of https://github.com/kevinzenghu/FT-Edge
Content