Update saft location
Merge branch 'develop-dummyAppCli' into fix_bugs
Merge branch 'fix_bugs' into develop