sql.properties
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/es/coritel/events4codington/persistence/AreaDAOImpl.class