merge conflicts in tutorial4developer
merge conflicts in tutorial4developer

QISKit/qiskit-sdk-py,atilag/qiskit-sdk-py,QISKit/qiskit-sdk-py,atilag/qiskit-sdk-py,ChristopheVuillot/qiskit-sdk-py,QISKit/qiskit-sdk-py,atilag/qiskit-sdk-py,ChristopheVuillot/qiskit-sdk-py,ChristopheVuillot/qiskit-sdk-py