add missing defines doc file to marmalade project file
Group tests under test "folder"
Merge pull request #1966 from fape/marmalade_cosmetics

Marmalade cosmetics