no image png added, upload image type:file hidden
merged master with photo-upload branch