refactor procedures
fix contacts
merge contacts
merge contacts
fixed pre & post op textfields
merge
fix contacts
merge contacts
merge with develop