Use CentOS because Fedora is broken
Merge branch 'master' of github.com:heat-ci/heat-templates
Merge branch 'master' of github.com:heat-ci/heat-templates
Testing gluster template example
Merge pull request #8 from jasondunsmore/master

Update templates for new Cloud Server resource.
promoting dev to qa
updated for use in RPC v4.2.1
Merge pull request #9 from cloudnull/master

updated for use in RPC v4.2.1
update templates with trove resource
updating templates with trove resource
Merge pull request #10 from vikomall/templates_with_trove

Templates with trove
Merge branch 'master' of github.com:heat-ci/heat-templates

Conflicts:
	dev/wordpress-multi.template
Add simple cloud networks example
Correct lb IP attribute ref in output.
Fix lb attribute (accessIPv4->PublicIp
fix templates
revert prod templates
fix type
fix qa template type
fix dev template type