Third Commit By Jagoth
Merge remote-tracking branch 'origin/master'

Conflicts:
	PaperLessExm_v2/nbproject/private/private.xml