Merge branch 'development-raihan'
updated edit options
fix
fix
fix
Merge branch 'development'