Merge pull request #1 from dianping/master

merge
Merge pull request #2 from dianping/master

merge
app code :1 finish normal flow , 2 finish roll flow, 3 unfinish recovery flow
app code : delete a deprecated class
add .gitignore