changed group page
resolved merge conflict
started reworking contacts index page