.
Merge branch 'develop' into phonegap