Merge pull request #1 from nanofi/feature/project

Feature/project
Merge remote-tracking branch 'origin/develop' into feature/project