Added remember_token to protected $hidden variable
Fix grammar in config/mail.php
Added redis to list of available queue drivers
Improved badges
Merge pull request #2885 from GrahamCampbell/badges

[4.1] Improved Badges
Add note about expire time

Might be confusing for users, if the expire time is not stated.
Updated badges
Merge pull request #2935 from GrahamCampbell/badges

Updated Badges
Merge branch 'master' into develop
Merge pull request #2929 from barryvdh/patch-3

Add note about expire time
Merge pull request #2854 from seeARMS/patch-1

Added redis to list of available queue drivers
Merge pull request #2853 from anewmanjones/patch-1

Fix grammar in config/mail.php
Merge pull request #2851 from juukie14/user-model-hidden

Added remember_token to protected $hidden variable
Fix wording.
Merge branch 'master' into develop
Merge development branch.
Merge tag 'v4.2.0' into 4.2
Ignore .sublime-workspace file
Merge branch '4.0' into 4.1

Conflicts:
	.gitignore
Add 404 page for testing App::missing()