fixing contextIOservice and emailservice
resolving conflicts and commiting before merging dan's pull-req