Upload box styling
merge with 471, resolve conflict
changes from code review
Merge pull request #1824 from Wikia/VE-488

VE-488: Add upload box and style