remove connectionLogging
Update ruby-on-rails.template to work with CentOS 6.4
Update php-app.template to work with CentOS 6.4
Update RoR template to Fedora 18

Conflicts:
	ruby-on-rails.template
Update RoR template to Fedora 19
Remove RoR from catalog.
Merge branch 'qa' into staging
Add nodejs to list of pkgs to install in RoR template.
Revert "Remove RoR from catalog."

This reverts commit 4ee357e9b4bc9610701425767ec2c5db1e507228.
updating default image value

Windows Server 2012(Updates) no longer listed in available images
updating default image value

Windows Server 2012(with updates) no longer listed in available images
updating default image value

Windows Server 2012(with updates) no longer listed in available images
updating default image value

Windows Server 2012(with updates) no longer listed in available images
Fixed wp-resource package name.
Single node wordpress with cloud DB
Windows multi-node wordpress template (with resource group)
restructuring repo to put env in directors instead of branchs
fixing json parse error
adding qlikview and iis templates
add chef solo template