Revert "Revert "Merge branch 'dev' of github.com:Wikia/app into aden-899-rh-minus""

This reverts commit 10cbe8d0d755b997b1a94578f2f5fd075c2ae198.
Revert "WIKIA_BAR_BOXAD_1 size fix"

This reverts commit 0cdd9a67f03206aa2106e46f377d7da72115d9a2.