Rebase Codebase

This version rebases the codebase to the latest development. At this stage we will begin standard release procedures.