Manual merge of project specific development
- Aggregation framework api
- Several Factory classes
ignore mac file system pollution and target folder