new ide files
Merge branch 'new_ide' into develop