Merge pull request #73 from daniellemayne/develop

Develop - added capabilities support
Merge pull request #75 from daniellemayne/develop

Develop: bugzid 4026: fixed paging
Merge pull request #78 from daniellemayne/develop

bugzid 4015: templates and snapshots can be made public but not shared w...
Merge pull request #80 from daniellemayne/develop

bugzid 4082: pass zoneid parameter when deleting templates
Merge remote-tracking branch 'upstream/develop' into develop