changed java 1.7 to 1.6 to simplify Cloudify deployment. Also the port of rest service is now discovered rather than hardcoded
Merge branch 'master' of https://github.com/fe2s/xap-storm