Reviewed sprint-3. Js to be reviewed.
Resolved conflicts