fix for the structure and template
now the slides are dinamically identified from the user name
slides grouped by 3
Merge remote-tracking branch 'upstream/master'

more merging of the slideshow