ver0.17.0 (galeria)
Merge branch 'aaron'