debugging ad report showing numbers instead of names
Merge branch 'brad_dev' of https://github.com/citrtech/djland into brad_dev
Revert "debugging ad report showing numbers instead of names"

This reverts commit 86d4c2378077b95f5d602b1ec92be56b81cdb274.
Merge branch 'brad_dev' of https://github.com/citrtech/djland into brad_dev
fix show hiding / showing button
Merge branch 'master' of https://github.com/citrtech/djland
moved config out of headers folder
Merge branch 'master' of https://github.com/citrtech/djland
timezone set, error checking for folder permissions - now no more ugly php warnings when running setup.php hopefully
fix <? instead of <?php in charting handler
flexible config.php requiring in case in a subfolder
Merge branch 'master' into dev