merge development -> master, replace 'samples/development' with 'samples/master'