Updating code to latest version
Merge branch 'master' of https://github.com/kimhansen/FairPhone