Update to Hapi V6.0
Syntactical fixes and dependency updates
Merge branch 'leore-master'