Merge branch 'master' of github.com:concrete5/concrete5
Merge pull request #1076 from hamsterbacke82/patch-2

Get bIDs of current version
Merge pull request #1120 from JohntheFish/patch-10

Just the bug fix from 776
Revert to short tags prev commit
Add-in missing .ccm-ui wrapper in Page List block form

Always get alot of ugly and unexpected UI/layout issues when adding/editing the core Page List block on the front-end (especially when using Bootstrap in my theme itself) and simply remedied by adding in a .ccm-ui wrapper (and an 'unstyled' class on the top tabs).

Reigns in header styles, alignments, etc...everything looks as it (probably) should!
Merge pull request #1187 from mkly/merge_1157_page_list_ccm_ui

Add-in missing .ccm-ui wrapper in Page List block form
Spacing and variable fix

Spacing and variable fix
Merge pull request #1115 from mlocati/show-error-deleting-backup

Show an error if the removal of a backup fails
Merge branch 'select-controller-settings-methods' of github.com:aghouseh/concrete5 into merge_append_1180_select_attribute
Change Private Properties to Protected

Change private properties to protected for overrides and new public
methods
combine two t-strings into one

better to translate it this way
Merge pull request #1188 from mkly/merge_append_1180_select_attribute

Merge append 1180 select attribute
Merge pull request #1189 from Remo/patch-48

combine two t-strings into one
Merge pull request #1103 from melat0nin/patch-8

Prevent dashboard sort arrows displaying above context menu
Merge pull request #1094 from aghouseh/add-check-to-attribute-category-association

added a check before executing SQL to associate an attribute type to an attribute category
Merge pull request #1155 from arcanepain/patch-1

Resubmit: Addition of 'number' method/input type to Form Helper
good ol' onkeypress.
Enable Browser Spellcheck due to EOL GoogleSpell

Enable Browser Spellcheck due to EOL GoogleSpell

'GoogleSpell' spellchecker no longer works. Enable Browser Spellchecking
as a partial fix
Merge pull request #1191 from mkly/kindof_fix_tinymce_spellcheck

Enable Browser Spellcheck due to EOL GoogleSpell
refactor: call attribute controller function to determine if multiselect (instead of inline helper function with yucky SQL query)