fixed action xml loader, added player xml loader, some enum changes
fixed merge conflicts