Test merge
Merge branch 'master' of https://github.com/erodrigueza/Bonafont.git

Conflicts:
	PoC_SpringBatch/.settings/com.springsource.sts.config.flow.prefs
Test merge
Fail in extends of FlatFileRead