Added option OctoPackEnforceAddingFiles

Default behaviour is unchanged, but if the user specify
/p:OctoPackEnforceAddingFiles = true, we keep user files and append the
default includes
Merge pull request #37 from valeriob/OctoPackEnforceAddingFiles

Added option OctoPackEnforceAddingFiles