Demo patch #2
Merge branch 'other-demo' into demo-patch

Conflicts:
	grails-app/services/com/netflix/asgard/AwsAutoScalingService.groovy
	grails-app/services/com/netflix/asgard/AwsClientService.groovy
	grails-app/services/com/netflix/asgard/AwsCloudWatchService.groovy
	grails-app/services/com/netflix/asgard/AwsEc2Service.groovy
	grails-app/services/com/netflix/asgard/AwsLoadBalancerService.groovy
	grails-app/services/com/netflix/asgard/AwsS3Service.groovy
	web-app/images/worldmap/eucalyptus.png