Parameter compatibility

Really not good to have same named methods with different parameter
lists.
Extend setup processing time

Adds processing time for SQL loops in setup to acomodate slow servers
Refactor getArticles()

Fix #450
make methods static
Wrong macro definition in jPlayer plugin
Revert "Wrong macro definition in jPlayer plugin"

This reverts commit 98ee245bd9ac939e21d93e1c4d8b22ef74ee7a85.
jplayer macro definition corrected (first attempt threw some repo errors because some branch switching was messed up somehow)
Err, the macro defintion was actually correct…when devs are confused by their own docs :-)
fix #454
Trap bad image size parameters
Merge branch 'master' of https://github.com/zenphoto/zenphoto
Detect macro expressions issues

Expressions logically may not have optional parameters (e.g. you cannot
add x+y if there is no y). Macro listing and parsing will now detect
mismatched parameter lists vs replacement tokens.
Merge remote-tracking branch 'origin/master' into 1.4.6