Merge branch 'master' of
https://github.com/mmilanovic/android_summer_school.git
Merge branch 'master' of https://github.com/mmilanovic/android_summer_school.git