Update the develop branch.#9

Merged

thomashaener merged 8 commits intodevelopfrom

Jan 19, 2017

Commits on Jan 10, 2017

Preparing the IBM format for QASM 2.0 API (it still works with 1.1 API)
francabrera
committed