Merge
Updgrade gradle
Proguard thing
Add app
Change target SDK
Merge