Update the Development branch so is not behind master anymore

Not completely sure I have done this request the right way round (so watch out in case it is not!). In short: It would be useful to use this branch for development but for this to be successful the dev branch should not be behind master for this to work out.