add url escaping
keep template updated
Merge branch 'dev' into b2g