remove update timer code so it shows up in comparison between branch with updates and branch with updates
Merge branch 'apks' into apk-updates
readd files removed by merge