renamed conflicting JavaScript functions FS#2915
Merge pull request #505 from splitbrain/fs2915

renamed conflicting JavaScript functions FS#2915