minor settings.py changes to improve website performance.
simple push test
update to message
Merge branch 'dev'

Conflicts:
	source code/PowerDecoder/Django Webpage/DNP3/tests.py
	source code/PowerDecoder/Django Webpage/RunSite.bat
	source code/PowerDecoder/Django Webpage/power_decoder/settings.py
Merge branch 'dev' into DataLinkLayer

Conflicts:
	source code/PowerDecoder/Django Webpage/DNP3/tests.py
	source code/PowerDecoder/Django Webpage/power_decoder/settings.py
DataLinkLayer - All test passing.  This branch is basically done