merge modifications
Merge branch 'master' of github.com:Mohamed5amy/tms

Conflicts:
	app/views/user_stories/create.js.erb
	app/views/user_stories/update.js.erb