Fixing JayData generator
Merge branch 'master' of github.com:smartytime/swagger-codegen

Conflicts:
	src/main/resources/enyo/model.mustache