Merge branch 'master' into live
Merge branch 'master' into live
fixed build
Merge branch 'master' into live

Conflicts:
	build/build.xml
Merge branch 'master' into live
Merge branch 'master' into live
Merge branch 'master' into live
Merge branch 'master' into live
Merge branch 'master' into live
wip scriptureforge paratext export
first draft of ParatextExport class with tests
improvements to paratext export; added UsxHelper->getMetadata() and tests
fixed up tests
fixed javascript error (missing semicolon!)
changed variable name 'export' to 'exportConfig' in hopes of appeasing the yui-compressor
tweaks to ParaTExt export function
sanitizeComment for ParaText Export function
improved paratext export filename
updated jamaican psalm frontpage text per user request
paratext export filename tweak