code cleanup in Dynamics NAV helpers
Code cleanup in SCP
Code cleanup in XpkgHelper
Code cleanup in ILMergeHelper
Merge branch 'develop' of https://github.com/fsharp/FAKE into develop

Conflicts:
	src/app/FakeLib/DynamicsNavHelper.fs