Fix project file
Update Android Studio configuration files
Resolve merge conflicts
Update project files
Update copyright date
Update project files