v2.1
Merge branch 'master' of git://github.com/houlei2/flashstack into houlei2-master

Conflicts:
	README.md
Merge branch 'houlei2-master'