updating rapidsms_contact
updating contact
merging master