no longer fails on year values
tweaked warning messages
no more warnings
fixed conflict
Merge branch 'gidden-warpdrive' into develop