Add terminateDate in Promotion
.
Merge branch 'master' of https://github.com/tcgroup/repo

Conflicts:
	TNC-Demo/grails-app/views/movie/_form.gsp
	TNC-Demo/grails-app/views/movie/index.gsp
	TNC-Demo/grails-app/views/movie/show.gsp