Dev: edited plist
Merge branch 'development'