html layout of interface with filter panel and colour changes
Merge branch 'master' of https://github.com/trademapper/trademapper-js

Conflicts:
	trademapper/index.html