Merge remote-tracking branch 'origin/master' into keyboard-binding-incoming-updated-topics
Merge remote-tracking branch 'origin/master' into keyboard-binding-incoming-updated-topics

Conflicts:
	config/locales/client.en.yml
UX: Add keyboard binding for reply as new topic
Removed extra translation in the keyboard shortcut modal window
Merge pull request #2723 from cpradio/keyboard-binding-incoming-updated-topics

UX: Keyboard binding incoming/updated topics
UX: dim the new and unread education
UX: simplify copy for summarize topic mode
FIX: use short date format for post navigator
Merge pull request #2726 from techAPJ/patch-4

FIX: use short date format for post navigator
FIX: use short date format for topic summary
Merge pull request #2727 from techAPJ/patch-4

FIX: use short date format for topic summary
Merge branch 'master' into cpradio_master
Merge remote-tracking branch 'cpradio/master' into cpradio_master