major changes, merges from everybody

this is the lastest working version.
i did not tested nor properly went trough the fighting class
this version is running and everybody should continue from that point.
the function: on_healButton_clicked had to be commented