jl

Signed-off-by: langstrom <langstrom@gmail.com>
Merge remote-tracking branch 'origin/master'
dcd
Merge remote-tracking branch 'origin/master'

Conflicts:
	RDFProject/src/view/CustomDialog.java