Updated 2.5 API
Merge branch 'master' of github.com:CloudifySource/cloudifysource.github.com