Improve some option descriptions
Added option to embolden edited times
Remove tabs from blank line
Merge pull request #1735 from erikdesjardins/highlight-edited-time

Added option to highlight edited times
Merge pull request #1729 from erikdesjardins/better-option-descriptions

Improve some option descriptions
Enable unsafe-content-script for Firefox

This makes RES work on Firefox 36 (nightly). This will likely break completely in the future, as Mozilla is making security-related changes to UnsafeWindow[1]. For now, however, it makes RES work on the latest Firefox nightlies without issues.

[1]: https://blog.mozilla.org/addons/2014/04/10/changes-to-unsafewindow-for-the-add-on-sdk/
Merge pull request #1743 from K900/patch-1

Enable unsafe-content-script for Firefox
Fix handling of imgur 'hash list' albums
Merge branch 'master' of https://github.com/honestbleeps/Reddit-Enhancement-Suite into imgur-hash-list-albums
Add comment tools to modqueue-like pages
Slightly different regex
Merge pull request #1747 from erikdesjardins/modqueue-comment-macros

Add comment tools to modqueue-like pages
Integrate fix into main match regex
Merge pull request #1745 from erikdesjardins/imgur-hash-list-albums

Fix handling of last image in imgur 'hash list' albums
subreddit macroPlaceholder returns subreddit of current thing, or current subreddit if not explicit
reply_to macroPlaceholder returns subreddit of current thing, or current subreddit if not explicit
refactor RESUtils.subredditForElement from commentTools.magicPlaceholders for subreddit
RESUtils.subredditForElement also looks for subreddit in closest tagline or for the first/only link on page
Merge pull request #1749 from andytuba/macroplaceholder-outsidecommentpages

{{subreddit}} and {{reply_to}} macro placeholders work when not in comments page
Merge branch 'master' into more-noCtrlF

Conflicts:
	lib/modules/betteReddit.js