Merge remote-tracking branch 'origin/master'

Conflicts:
	src/de/lmu/ifi/bio/splicing/jsqlDatabase/DBQuery.java