[MM,PS,MS] - Fixed map, added map feautures, fixed test cases
[KW,MS]{test after code} - added some GUI tests
[MM,PS,MS] - Fixed map, added map feautures, fixed test cases
[KW,MS]{merge} - resolved merge conflicts