Update (JSON genetator added and little changes)
Merge branch 'dev' of https://github.com/savi-bcrl/aurora into dev