Merge branch 'master' of /Users/philipleufstedt/Android/hkr-android-project-gd/ProjektBygg/hkr-project with conflicts.
tidlapp databas