gallery api
Merge branch 'master' into gallery_api
tweaks on the gallery model
fix conflicts
increase transparency
use api for galleries