Change fixed width of logo in header to max-height. Addresses issue #1045

Add max width
no need for the undefine
correct topic and category counting query
revive old styling that was stripped
Merge pull request #1525 from squareleaf/logo_header_height

Change fixed width of logo in header to max-height.
Update client.zh_CN.yml
Up-to-date pt_BR translations

- some fixes to more approprieted language
- mimic source(en) files to easy future translations
- added missing texts
a few general fixes to the new flatter theme
a few more fixes, detailed here: http://meta.discourse.org/t/flatter-styling-now-deployed/10515
Merge pull request #1552 from awesomerobot/master

a few general fixes to the new flatter theme
Remove duplication of action defintion, add missing spec for topics_by, extract out URL construction logic
work in progress sortable categories
categories can now be re-ordered
oops add security
gutter links shouldn't fade, fixed
css transitions were too slow, sped up
correct ordering algorithm
Merge pull request #1545 from railsaholic/lists_controller_refactor

Remove duplication of action defintion
Merge pull request #1554 from awesomerobot/master

gutter links shouldn't fade, fixed
Merge pull request #1553 from lucasts/master

Up-to-date pt_BR translations
Merge pull request #1551 from ofgeek/patch-1

Update client.zh_CN.yml