	Merge branch 'master' of https://github.com/jordiponsllaurado/eodf_conference into dbMigration
	Merge branch 'master' of https://github.com/jordiponsllaurado/eodf_conference into dbMigration

jordiponsllaurado/eodf_conference,jordiponsllaurado/eodf_conference,jordiponsllaurado/eodf_conference