property files
property files
fixing properties
Merge remote-tracking branch 'origin/master'

Conflicts:
	properties/genbank.local.properties