fixed popup header styling
updating branch to keep up with master

Merge branch 'master' into navigation
Merge pull request #33 from chorus-frogs-2014/navigation

Navigation