Changed code to fit new database design
Merge remote-tracking branch 'origin/master'

Conflicts:
	BSUP-Report/report.synctex.gz