cross merge fullstack_release_candidate into trunk

git-svn-id: https://hyracks.googlecode.com/svn/trunk@3208 123451ca-8445-de46-9d55-352943316053
diff --git a/fullstack/hivesterix/hivesterix-dist/resource/deploy/jar.sh b/fullstack/hivesterix/hivesterix-dist/resource/deploy/jar.sh
new file mode 100755
index 0000000..a19b1b8
--- /dev/null
+++ b/fullstack/hivesterix/hivesterix-dist/resource/deploy/jar.sh
@@ -0,0 +1 @@
+jar cmf manifest.txt .