Added a way to override the main file of a dependency
Merge pull request #91 from florianv/issue7

Added a way to override the main file of a dependency
Merge remote-tracking branch 'remotes/upstream/master' into module-type-fix-squashed