Merged Master with BrunoBranch
Worked on Party Classes