First try to commit via Android Studio

Let's merge master and master2 branches