fix user/username error class
Add site setting show_create_topics_notice as a way to hide the 'Create at least 5 topics to get discussion started' message.
Merge pull request #2386 from awesomerobot/master

merging more styles into base, also fixing <big> abuse
Clean up notifications if a user can't see a topic
Show categories on the user streams for topics.
Merge pull request #2385 from fantasticfears/css_modal

fix user/username error class
ES6: A few more controllers on a Holiday Monday
Allow multiple subcategories with the same name
[FIX] Wiki Topic - IE / FF problem with post admin menu.
New Setting: Don't jump to new posts when replying
We dont need image sorcery gem for a single convenience method
add ignore for tombstone
Improve resize logic so images end up sharper
Work in progress, keeping avatars locally

This introduces a new model to store the avatars and 3 uploads per user (gravatar, system and custom)

user can then pick which they want.
BUGFIX: sometimes we have stringio, it has no close
Fix specs for avatars
Implement avatar picker
Correct avatar related jobs
We need pry in development
BUGFIX: broken spec
BUGFIX: include avatar for system user
BUGFIX: exclude avatars from mini profiler