Update clor scheme, fix build errors with Android Studio 1.0
Fix merge conflicts