Delete language.settings.xml
unstage language.settings
unstage language.settings
Merge branch 'master' of https://github.com/optimad/PABLO.git
Merge branch 'master' of local repository into install
install system 0.1
Merge branch 'install' of https://github.com/optimad/PABLO into install