update .gitignore
solve merge conflict
add auto-restore onResume()
add save to sdcard
fix saved-image background bug
add drawable resouces
add size/transparency picker, half done