making sure branch is up to date before switching to dev
completed views except for paging and sorting and styling
fixed conflict