Merge branch 'dev1' into dev1-1
simplify the projects
Merge branch 'dev1-1' into dev1