Don't render 'Reply' button when user can't post
Use ERB when importing conf files into app
Added and updated Spanish translations

Updated:
1. client.es.yml
2. server.es.yml
3. server.en.yml
Don't display edits during user's name update
Update outdated instructions in Quick Guide
Merge pull request #1955 from verg/update-quickstart-guide

Update outdated instructions in Quick Guide
Detect Googlebot from user agent and use a different layout that doesn't load javascript
FIX: If default page is categories, anonymous users were seeing latest
categories when going into a category.
remove randomisation for now from bench
allow bench to run with unicorn optionally
memstats can output yaml now
fix typos in posts_controller_spec.

fixing 'suceeds' typo.
Fix subcategories links from search
Use --no-document instead of --no-rdoc/--no-ri.

gem says --rdoc and --ri options are deprecated.
Scroll to top on Site-Setting category render
Merge pull request #1960 from verg/subcategory-search-links

Fix subcategories links from search
Merge pull request #1962 from eflynn/master

Use --no-document instead of --no-rdoc/--no-ri.
Merge pull request #1954 from verg/unbind_user_name

Don't display edits during user's name update
diff heaps used for memory leak detection
FEATURE: allow overriding server static asset if needed
BUGFIX: Use ENV["USER"] before falling back to postgres