Simplify branching
Search Refactor: Remove some manual SQL, make search data tables more idomatic Rails/AR
Merge pull request #880 from bsides/patch-1

Adding Apache2 + Passenger instead NGINX
Just fixed a typo and added a warning

Honest mistake I took from pasting it from my own system :)
Merge pull request #882 from bsides/patch-1

Just fixed a typo and added a warning
minor copy changes
update the locale of zh_CN & zh_TW
User tracking state implementation progress for live unread / new counts
refactor Topic validation

introduce a couple of custom validators
fix minor discrepancies in tests
copy I18n error message keys to default location
clean up validation invocation
move some responsibilities out of validator into class
annotate topic model
remove unnecessary title quality tests from topic
Merge pull request #881 from novemberkilo/master

Improve flog metric for Post#extract_quoted_post_numbers
Revert annotation and non-English I18n changes
Merge pull request #884 from mattvanhorn/refactor_topic

Refactor topic
Merge pull request #883 from tangramor/master

update the zh_CN & zh_TW locales
Don't send notifications for moderator action posts
Helper to add a number to quoted_post_numbers
Helper to create reply relationship with post
Refactor Post#save_reply_relationships
rvm has offically depreicated .rvmrc and recommends using .ruby-version and .ruby-gemset instead.