Navigation bootstrap now blue pill style
Merge branch 'issue25-trial-pill-navigatio' of git@github.com:findsorguk/findsorguk.git

Conflicts:
	app/views/scripts/structure/contactsSidebar.phtml