Merge remote-tracking branch 'upstream/master'
Merge branch 'master' into heroku_mods
FIX: Touch events conflicted on mobile safari with `{{action}}`s, preventing admin menu
option from working. Mobile Safari works with click so this seems to fix it.
The posts rebake task should regenerate links too.
Update js_locale_helper.rb

Fix "undefined method `end_with?' for 1:Fixnum" when field name in YML file is not quoted number like:

```
    user_action_groups:
      1: "Likes Given"
      2: "Likes Received"
```

(yamllint.com validates such file as valid YML file)
Handle /t/only-the-slug urls by trying to find the topic by slug (second try)
Changed HTML Digest template. Removed margins, shrunk logo.
Only use HTML templates for the digest email.
Fixed ContainerView code to build views correctly
Fix annoying jshint :)
Store when a topic was first set to auto-close and report that amount of time when it closes. And do some refactoring.
Merge pull request #976 from abbat/patch-1

Update js_locale_helper.rb
Add 'apple touch icon url' site setting
work in progress migrate to moment
Notify moderators when someone is automatically blocked because of spam flags
jquery 1.9.1 upgrade ... remove jquery rails
missed a spot
$.browser is gone from jQuery 1.9 ... and this is a check for ie7 and 6 ... don't care
Merge pull request #977 from chrishunt/add-apple-touch-icon

Add 'apple touch icon url' site setting
Fix spec doc; sends welcome email for active users