Calculator sample in new branch
Calculator sample in new branch
Merge branch 'master' into develop

Conflicts:
	Samples/Calculator/build.bat
	Samples/Calculator/build.fsx
	Samples/Calculator/completeBuild.bat
	Samples/Calculator/completeBuild.fsx
	Samples/Calculator/foobar.bat
	Samples/Calculator/foobar.fsx
	Samples/Calculator/targetTemplates.fsx
fixing build