not much changed
Merge branch 'master' of https://github.com/kcurrier512/rama-phonegap
fixing conflicts