Fixed a bug where branch selectors were not visible

- Fixed JS lint problems
Merge branch 'staging' into katana