deleted .idea folder
Merge branch 'master' into dev
added configuration files