lemon
removed the little 'stars' next to required fields in the contact page
lemon gone
resolved merge conflict