auto dev server commit
Merge branch 'master' of https://github.com/delorenzo/Rebirth
Fixed flame script, added animation water script to waterfall