15-07-2014 2002
Merge remote-tracking branch 'origin/master'

Conflicts:
	derby.log
	tdldb/db.lck