Merge uconn-1 conflicts:
resources/wikia/modules/loader.js
extensions/wikia/GlobalNotification/GlobalNotification.js

CC @lizlux