fix merge error + refactor mas_analytics.js to use strict mode.