oppdateringer
Merge branch 'master' of https://github.com/torveld/phonegaptest