fixed font bug
Merge branch 'master' of https://github.com/Macmee/bestMapAppNA
Merge branch 'master' of https://github.com/Macmee/bestMapAppNA
fixed bug with router where default route ran in wrong order
Merge branch 'master' of https://github.com/Macmee/bestMapAppNA

Conflicts:
	src/styles/base.less
	src/styles/colours.less