Fixed use of parameters in mysql::query + added defaults
Merge fix
Template changes to fit the current master format
Fix for db access by alternative users also for mysql::queryfile