Bugfixing on the timer
Merge branch 'dev' of github.com:Stoyicker/agile_group2 into dev
Fixed the case of the navigation drawer not updating the selected item upon poping the backstack
Fixed the build.