20141110 commit

fix scan, return button bug
fix add dialog bug
optimize the work flow
20141201_commit