first changes (bugged now)
Merge branch 'master' of https://github.com/makiolo/GPGOAP