Activities, res-s, updated build.gradle
iml+modules
After merge