rajesh
Merge branch 'master' of https://github.com/technova/test-opswork

Conflicts:
	catalog/recipes/deploy_app.rb