Merge branch 'dev' into css-chrome
Merge branch 'dev' into css-chrome

Conflicts:
	includes/wikia/tests/WikiaBaseTest.class.php
Merge branch 'dev' into css-chrome
Merge branch 'css-chrome' into DAR-733