Pre launch commit - pics and other things
Fixed merge conflict ...