update to settings, xml and log
Merge branch 'master' of https://github.com/rwihaib/Ribbons