Added Comment "Nithya Pari 26th October 2013"
name
Merge remote-tracking branch 'origin/master'
name
Added Comment "Nithya Pari 26th October 2013"
Merge remote-tracking branch 'origin/master'
Added Comment "Nithya Pari 26th October 2013"
Modified two methods - able_to_submit and delete
Modified  method - force_delete
many changes made
27Oct changes to assignment_participant by SM
adding Cycle model
OSS808 27th October 2013 Changes maded in Assignment_Participant.rb
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/models/assignment_participant.rb
chnages
final push
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/helpers/file_helper.rb
	app/models/assignment_participant.rb
	app/views/submitted_content/_submitted_files.html.erb
Code Changes made as per feedback from Andrew Kofink - 6th November, 2013
Code Changes made as per feedback from Andrew Kofink - 6th November, 2013
Merge branch 'master' of https://github.com/npari/expertiza_oss808 into e808
Closes #359

Conflicts:
	app/models/assignment.rb
	app/models/assignment_participant.rb
	app/models/automated_metareview/text_preprocessing.rb
	app/models/automated_metareview/tone.rb
	config/routes.rb
	test/fixtures/assignments.yml
	test/fixtures/invitations.yml
	test/fixtures/participants.yml
	test/fixtures/users.yml