Fix Bug 940406, ensure JSON is always returned for Ajax request to avoid parse errors
Fix bug 938884, restore nav panel on file view
Fine tuning the panel
Merge pull request #205 from ossreleasefeed/bug938884-restore-nav

Bug938884 restore nav and always return JSON for Ajax calls.
Merge branch 'ui' of github.com:mozilla/dxr into ui

Conflicts:
	dxr/static/css/dxr.css