Config Modifications
Remove dev folder
Update .gitignore
Update .gitignore
Merge branch 'develop'