Merge branch 'master' of gitlab.fi.muni.cz:xsotolar/irtis-data-collector

# Conflicts:
#	.gitignore
#	app/src/main/java/cz/muni/irtis/datacollector/activities/MainActivity.java
#	app/src/main/java/cz/muni/irtis/datacollector/activities/settings/RootScreenFragment.java
#	app/src/main/java/cz/muni/irtis/datacollector/metrics/util/screenshot/ImageTransmogrifier.java
#	app/src/main/java/cz/muni/irtis/datacollector/metrics/util/screenshot/ScreenshotSaver.java
#	app/src/main/java/cz/muni/irtis/datacollector/schedule/SchedulerService.java