Djnro0.9

branch of REANNZ/master fulled updated from upstream grnet:master and with the non-REANNZ specific changes added