Make mailbox a key for self-sent messages
Merge remote-tracking branch 'upstream/master'
Correct use of t2

Don't suppose that numbers always come before the text in strings like
"3 Blocks".
As a general rule, string concatenation should be always avoided when
dealing with translations.
Remove "Events" from aliases
Merge pull request #250 from Shotster/remove-events-from-aliases

Remove "Events" from aliases
including grid less into bootstrap less
Merge pull request #262 from evancooper/include_bootstrap_grid

Including grid less into bootstrap less
rebuilding bootstrap, js and css release
dashboard formatting progress
Merge pull request #249 from mlocati/patch-1

Correct use of t2
Merge pull request #239 from jkoudys/master

Include msgMailboxID in the key for UserPrivateMessagesTo
Making clock show up
Merge branch 'master' of github.com:concrete5/concrete5-5.7.0
Add preview pane to autonav
Remove the added autonav list template
increase autonav add/edit interface width
#229 dashboard and system setting dashboard pages. We will need to look into the margin beneath legends and the alignment with the page title, as that will affect all dashboard pages, but otherwise these should be good.
Merge pull request #296 from evancooper/dashboard_system_and_dash

Dashboard system and dash
#229 dialing in dash and system and setting pages with some custom styles and h2s
Merge pull request #309 from evancooper/dashboard_system_and_dash

#229 dialing in dash and system and setting pages with some custom style...