merged piotr changes
added octopack as a test
added nuspec file for test
undo test
another test
Merge remote-tracking branch 'upstream/master'