OSS808 27th October 2013 Changes maded in Assignment_Participant.rb
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/models/assignment_participant.rb