Update files related to continuous integration
Merge branch 'xifi' into develop