adding task view
Merge remote-tracking branch 'origin/develop' into develop
navigate through task done
FIX ISSUES
Merge remote-tracking branch 'origin/develop' into develop
fix master