get area handle and name through method which is easier to override
Merge branch 'master' of https://github.com/Remo/concrete5
Merge branch 'master' of https://github.com/concrete5/concrete5
https://hackerone.com/reports/4939

and some indenting
https://hackerone.com/reports/5420
minor fix
https://hackerone.com/reports/5417 Part 1
https://hackerone.com/reports/5417 Part 2
https://hackerone.com/reports/4930

Also cleaned it up a bit...
minor fix v2
https://hackerone.com/reports/5392
https://hackerone.com/reports/4940
Fix php error when no cID is passed
check for defined constants
make it possible to search for 0/1 and nothing
Merge pull request #1762 from Remo/patch-2

check for defined constants
revert

https://github.com/concrete5/concrete5/commit/71544e016479754da0dfc048f2f5ec6d5a944fe7
Remove duplicate array keys.

Values were the same, so this is merely a very slight performance fix.
Merge pull request #1789 from jezmck/master

Remove duplicate array keys.
Remove XSS from tags attribute