adding tabs and moving branding into sidebar
Merge branch 'master' of https://github.com/trademapper/trademapper-js

Conflicts:
	trademapper/build/css/trademapper.css
	trademapper/resources/styles/trademapper.scss