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
Merge branch 'newsflow' of https://github.com/mnkras/concrete5

Conflicts:
	web/concrete/js/ccm.app.js