Renamed sources folder to Sources (was ProjetVaR_Software) and renamed Qt project to ProjetVaR
Correcting Travis config after last commit (Qt project and folder renamed)
Merge conflict fixed