Fully updated my working tree to the master/development branches