Fix saving error of video editor in non-english translation

Currently the code in ```tabs-aggregator.coffee``` uses the display name of a tab as the key to index the current tab. When a non-english translation is applied, the javascript code will get localized names instead of the original english names, which causes the following ```getValue``` function fails as it cannot reference the correct tab.
Use the 'data' attribute to store the original tab name.
Do not look for country if no new ip.
Fix modulestore merge conflict with heartbeat.
Corrected event name in description
PR 2571, log stop_video event
Updated for PR 4106, BLD-1134
Fix the category subcategory navigation conflicts