Merge branch 'develop-projects' Conflicts: templates/nemo/nemo.clean templates/nemo/nemo.ini templates/nemo/nemo.post