minor changes
Merge remote-tracking branch 'origin/master'
imported project to Android Studio