mainly splash fx code changes
Merge branch 'master' of
git@github.com:kryptick/bubblebathbay_sandbox.git