image types
Merge branch 'master' into new_front
gallery working