Fix #455
Merge branch 'master' of https://github.com/zenphoto/zenphoto
Show how to use globals in macros

Also fixes preg issue if there were $ signs in the macro
Merge branch 'master' of https://github.com/zenphoto/zenphoto
methods to allow setting of sort ordering globally
Merge remote-tracking branch 'origin/master' into 1.4.6