fixes timelines modal changed dialog, now it should only appear when properly initialized

Conflicts:
	app/assets/javascripts/modal.js
moved cancelbutton to timelines modals.