Update .gitignore
commit libs
Merge branch 'master' into develop
update project