Merge branch 'master' of github.com:BeenzSyed/heat-templates

Conflicts:
	dev/kitchen_sink.template
Merge branch 'master' of github.com:BeenzSyed/heat-templates