Changed JsonObject items in Template object graphs to strings as JsonObject does not serialized well, and refactored some Resource object code to lessen Template object size.  (Cloudformation)
Changed a few method calls to make the static groovy compiler and SWF happy
Forgot to add the ResourceInfo to the ResourceAction in StackCreator, the accountId to the ResourceInfo in CloudFormationService, and had wrong default class names in StandardResourceResolver (cloudformation
merged from testing and one conflict fixed
one error during merge from testing (everything compiles now)
added soft_delete and also a template table
Partial commit of glisten workflow code to have code on a qa box to guinea pig (EUCA-8315)
forgot a couple of classes
Rollback, delete working (EUCA-8315)
parsed outputs instead of output (EUCA-8315)
Merge branch 'testing' into dev/ethomas/EUCA-8315
fixed some db issues
more fixes for cloudformation (EUCA-8315)
a lot of refactoring to remove redundant db data, also changed collections in Stack to be json list (EUCA-8315)
more fixes in cloudformation
adding some final cloudformation fields and support for CAPABILITY_IAM detection
a few more changes to cloudformation
more cloudformation changes
added some IAM support to CloudFormation and a few bug fixes
final methods for cloudformation