Merge pull request #157 from graimundo/master

New schema to support new marketplace functionality
- Corrected typo in schema
- Added first proposals of categories and development stages