Delay works again
Merge branch 'dev' of https://github.com/AndyBarron/CivilWar2014 into dev