Merge pull request #1 from jmezach/master

Get in sync
Split ProjectFile from OutputAssembly

Split the ProjectFile and OutputAssembly into two different properties,
since they are not always in sync.
Merge pull request #2 from marktaling/master

Split ProjectFile and OutputAssembly