Time limit for capturing perceptions are fixed
Merge remote-tracking branch 'origin/master'

Conflicts:
	Sith_Web_Application/src/main/webapp/event/event.jsp
Merge remote-tracking branch 'origin/master'
Time limit for capturing perceptions are fixed