move some functions into the class since they are not to be generally used.
Merge remote-tracking branch 'origin/1.4.5' into slideshow-changes
some fixes for the new slideshow macros

This fixes the broken page. However, the slideshow does not play,
instead it the page shows the first two pictures.