Fix wiki search query
and formatting error in a doc file.
Merge pull request #4063 from edx/dhm/mongo_tweaks

Fix wiki search query
Fix Transifex configuration so we can merge translations
Add Chinese (Hong Kong) language
Fix failing test and update docstrings for video player

Fixes BLD-1115
Merge pull request #4055 from edx/sarina/fix-underscore-resource

Sarina/fix underscore resource
Merge pull request #4074 from edx/alex/fix_video_saved_editor

Fix failing test and update documentation of video player
Ignore *.css.map files
Merge pull request #4076 from edx/sarina/ignore-maps

Ignore *.css.map files
Squashing commits,

Squashing commits

Transition to Oqaque Keys

Bug fixes

Fixing regenerate_user
Fix incorrect video bok choy test.
Merge pull request #4083 from edx/alex/fix_syntax_error_in_video_player_test

Fix incorrect video bok choy test.
ORA2 release-2014-06-13T11.52
Merge pull request #4088 from edx/will/ora2-release-2014-06-13T11.52

ORA2 release-2014-06-13T11.52
Update translations (autogenerated message)
Changing over imports to opaque_keys.edx
Merge pull request #4091 from edx/sarina/06132014-language-update

Update translations (autogenerated message)
Merge pull request #4075 from edx/han/regenerate_user

Transition to Oqaque Keys
Refactor heartbeat to delegate to the modulestores and sql
LMS-2801