Henrik Reitan #011
Added missing files from last commit
Merge branch 'camera' of https://github.com/persn/Lommeradaren.git into camera