Merge pull request #144 from CalvinFernandez/development

Added css to fix bootstrap navbar issue
working with backbone more
asdf
added filter by companies and fixed routing issues