Commits for pauline

v294_base to v295_preview (2014-01-13 to 2014-01-20) v295

• Fixing typo in long label found by contributor. refs #10954
  • src/hg/makeDb/trackDb/trackDb.ra - lines changed 1, context: html, text, full: html, text
• Fixing merge conflict.