Merge remote-tracking branch 'origin/layout' into gh-pages
Merge branch 'gh-pages' of https://github.com/JohanEks/testrepo into gh-pages
Fixed meter specific info panels
Merge branch 'master' of https://github.com/JohanEks/testrepo
Removed fixed heights from meter specific info panels
Merge remote-tracking branch 'origin/master' into player
Fixed meter specific info panels
Removed fixed heights from meter specific info panels
Merge branch 'gh-pages' of https://github.com/JohanEks/testrepo into gh-pages
Merge remote-tracking branch 'origin/master' into gh-pages
removed max-width
Merge remote-tracking branch 'origin/master' into gh-pages
Comment unused code, removed navbar
font-size meter-box
Merge remote-tracking branch 'origin/master' into gh-pages
Merge branch 'gh-pages' of https://github.com/JohanEks/testrepo into gh-pages
Changed font-size in info box
Fixed merge
changed from hash to url param
Merge remote-tracking branch 'origin/master' into layout