Dev: edited plist
Merge branch 'develop'