add money
Merge branch 'master' into VoodooUI