Mering a Lot of changes and updating the branch to latest development files.