WIP_frsela
Merge branch 'mozAPI_WILLY' of github.com:telefonicaid/notification_server into mozAPI

# By Fernando Rodríguez Sela
# Via Fernando Rodríguez Sela
* 'mozAPI_WILLY' of github.com:telefonicaid/notification_server:
  WIP_frsela

Conflicts:
	src/ns_ua/connectors/connector.js