Merge branch 'MartellDeveloper' of https://github.com/seacode/gmacs into MartellDeveloper
Merge branch 'MartellDeveloper' of https://github.com/seacode/gmacs into MartellDeveloper