working release
code cleanup, step2 save after back button
merge with ios