removed fail from script
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
fix view