.
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
LoginFilter added
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/edu/uoc/pelp/actions/StudentAction.java