#660 Fixed error Liz found in freemarker formulaHasResult function
#660 reverted the commenting out of db init scripts for now because there are some structureal changes still around and so we need them to all be run
Merge remote-tracking branch 'origin/t660' into resolved