Upgrade to bootstrap 3; added header to match www
Merge branch 'master' of https://github.com/WTF-Limited/portal

Conflicts:
	Gemfile
	Gemfile.lock
	app/views/shared/_header.haml
Merge pull request #7 from liahsheep/master

Layout change