Discourse.Computed tests refactoring
Remove best standards support for Rails 4 since it's been removed from ActionDispatch
Update client.pt_BR.yml

add pt_BR translation for 'this_year'
minimizing the desktop topic view, also effects the background on all pages and removed bootstrap
Update server.zh_CN.yml

Chinese Translation for `this_year`
Merge pull request #1547 from awesomerobot/master

minimizing the desktop topic view, removes grey background
Merge pull request #1548 from cassiuschen/patch-1

Update server.zh_CN.yml
Merge pull request #1546 from lucasts/patch-1

Update client.pt_BR.yml
Merge pull request #1536 from velesin/computed_tests_refactoring

Discourse.Computed tests refactoring
Merge pull request #1537 from fny/master

Remove best standards support for Rails 4 (Removed from ActionDispatch)
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.
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