Added Location Information to Header
Merge branch 'master' into development/header-location

* master:
  Fixed Huge Issue with AirDispatch Errors not following Go Protocol