TraditionalMarket, prop, const
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/es/coritel/events4codington/persistence/sql.properties
	bin/es/coritel/events4codington/util/Constants.class
	src/es/coritel/events4codington/persistence/sql.properties