Merge pull request #10 from jerrywell/master

Bug ZK-2357: Upload button hover style missing
Bug ZK-2398: Sortable tree missing sort icon on tree column