PictureLoader
fixed pictureloader
Merged branches