add some button
Android Manifest and strings
fix Android Manifest
Merge branch 'master' of github.com:nhvtgd/STEMPLUSPLUS
fix Customized Camera
fixed camera
fix conflict