fixed phonegap template escape bug
reorganized resources
Merge branch 'origin/dev'