essage=android changes
Merge branch 'master' of https://github.com/viktorievasova/thesis
android revision