fixed merge of camera.ios
fixed merge of camera.ios

kkwokwai22/snacktime,xfredlix/snacktime,jayvilla/snacktime,fjjk-snacktime/snacktime,kkwokwai22/snacktime,joeyrlee/snacktime,xfredlix/snacktime,xfredlix/snacktime,fjjk-snacktime/snacktime,kkwokwai22/snacktime,fjjk-snacktime/snacktime,jayvilla/snacktime,jayvilla/snacktime,kkwokwai22/snacktime,fjjk-snacktime/snacktime,joeyrlee/snacktime,joeyrlee/snacktime,jayvilla/snacktime,xfredlix/snacktime,joeyrlee/snacktime