Android studio project to master merge

Please review it
Recommend to use tabs everywhere. Go to Settings - Code Style - Use tab characters for everything.