Merge pull request #1336 from Oldiesmann/release-2.1

More HTML5 goodies
Merge pull request #1337 from Oldiesmann/release-2.1

! Don't count index.php and .htaccess towards number of files in directo...
Merge pull request #1338 from Oldiesmann/release-2.1

! Proper fix for the issue fixed in the last PR/commit
Merge pull request #1342 from Oldiesmann/release-2.1

! Make sure $modSettings['custom_avatar_dir'] is defined during the upgr...
! When adding a group notification, update the count of alerts the user has. Fixes #1339

Signed-off-by: Peter Spicer <sleeping@myperch.org>
! And remove some old debug code

Signed-off-by: Peter Spicer <sleeping@myperch.org>
Merge pull request #1343 from Arantor/release-2.1

Some bug fixes
! Tweak some of the wording in the profile menu

Signed-off-by: Peter Spicer <sleeping@myperch.org>
! Should hopefully clear up ambiguity for the user given our internal vs displayed terminology and fix #1278 in the process. Hopefully.

Signed-off-by: Peter Spicer <sleeping@myperch.org>
Merge pull request #1344 from Arantor/release-2.1

More fixes
! Incorrect quotes in the code meant it wouldn't save properly, only in no-deny and only for groups without manage boards permission, though only discovered after far too much investigation because all possible permutations had to be examined and retested rather than adequate information being given in the first place and irrelevant tangents involved in discussion. Fixes #1341

Signed-off-by: Peter Spicer <sleeping@myperch.org>
Merge pull request #1345 from Arantor/release-2.1

! Incorrect quotes in the code meant it wouldn't save properly, only in ...
! Hopefully prevent oddities of languages affecting custom field ids, fixes #1295

Signed-off-by: Peter Spicer <sleeping@myperch.org>
! Made warning result bigger per #527

Signed-off-by: Peter Spicer <sleeping@myperch.org>
Merge pull request #1346 from Arantor/release-2.1

More things to tweak.
! Fix some immediate bugs in PMs. Plenty more still broken.

Signed-off-by: Peter Spicer <sleeping@myperch.org>
Merge pull request #1347 from Arantor/release-2.1

! Fix some immediate bugs in PMs. Plenty more still broken.
! Actually assign the right label to something.

Signed-off-by: Peter Spicer <sleeping@myperch.org>
! More PM bug fixes, now at least if you move something into a label it shows you that you moved it. Still more bug fixes required.

Signed-off-by: Peter Spicer <sleeping@myperch.org>
Merge pull request #1348 from Arantor/release-2.1

Some of the PM bug fixes