1207
Merge remote-tracking branch 'origin/master'

Conflicts:
	db/database.db4o
1209