use config.from_object to set config
solve conflict
update settings
update translation
update ahhiche2014
update affiche2014.jpg