.
Merge branch 'master' of https://github.com/7day/7day_v0.03

Conflicts:
7day/7day Solution/Directory.cacheUAG
7day/7day Solution/Logs/7day_log_1.txt
7day/7day/DataFolder/data.waData
7day/7day/DataFolder/data.waIndx
7day/7day/Logs/HTTPServer.waLog
7day/7day/SymbolTable.waSym
7day/7day/SymbolTable.waSymData
.
.