Tumblr share option
Add line breaks to embed code
Update share boxes in views
Add br tags to the share code and add Tumblr sharing AND break the mailers, oops
Remove comment
A little nonsense now and then
Issue 1143: Switching back tag sorting, setting initial values for media tags
Merge pull request #1087 from elzj/fandom_sorting_fix

Issue 1143: Switching back tag sorting, setting initial values for media
Done for the day
Make sure we're only logging admin activity
Merge pull request #1088 from elzj/bot_logging_fix

Issue 3480: Make sure we're only logging admin activity
3491 remove livevalidation from change username form
Merge pull request #1089 from sarken/issue_3491

3491 remove livevalidation from change username form
Remove attempt to load nonexistent languages_menu JavaScript on main page, update some render syntax
issue 3229 fix included
Deprecation fix: replacing & with merge for relation merging
Merge pull request #1090 from elzj/merge_deprecation_fix

Deprecation fix: replacing & with merge for relation merging
Resolve merge conflicts with Twitter button
Define basic mapping for bookmarks to prevent test errors.
Run tag callbacks synchronously in test environment