First commit
Merge branch 'master' of https://github.com/LinusLjung/phonegap-test