Merge branch 'master' into develop
merge from master branch, all the changes made by Yasset
changed tasks to handle interruptions
Merge branch 'develop'
removed conflict after merging