Merge branch 'master' of github.com:discourse/discourse
Refactor User#update_last_seen! and User#update_tracked_topics
Utilize already existing method 'find_by_username_or_email'

check presence of email using include, dont use =~
cloud66 easydeploy
FIX: when allow_uncategorized_topics was false, PMs can not be created
correct rake test:prepare so it seeds the db correctly
move category creation into seeds as well, so db can be seeded from structure.sql
filter down the top level navs
implemented UI for filtered down by category view
better exception when discourse.ajax is called, still need to figure out how to fix it though :)
correct fixture
Add missing translation in FR
Merge pull request #1575 from GManzato/fix_fr_translation

Add missing translation in FR locale
FIX: make it possible to close popup-input-tips on touch devices, and position them a bit better
Refactor SpamRulesEnforcer so that each spam rule is in its own class
FIX: Various bugs with Category breadcrumbs
FIX: Mobile breadcrumb formatting
Merge pull request #1573 from railsaholic/use_existing_find_by_username_or_email

Utilize already existing method 'find_by_username_or_email'
Show Log In button at the bottom of the page body when login_required and not logged in
Merge branch 'master' of github.com:beerlington/discourse
Merge branch 'master' of github.com:discourse/discourse