change project config and frameworks position
change ignore file
update
update
adding
Merge branch 'dev'