Utilize already existing method 'find_by_username_or_email'

check presence of email using include, dont use =~
cloud66 easydeploy
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
Update client.zh_CN.yml
do not deselect text when clicking on the reply button below the post
allow uncategorized category in 2 more spots (hamburger and drop down)
allow passing in of hostname in sample file
use DISCOURSE_HOSTNAME instead
work around regression in ruby head
add failing test for AMS upgrade
cleanup API for looking up a user by email or username, add specs, fix invalid auto association in open id provider
Merge pull request #1574 from pkallberg/master

Cloud 66 EasyDeploy
remove change to readme