Merge branch 'dev' into b2g
Merge branch 'dev' into b2g
no change
Merge branch 'b2g' into dev
Merge branch 'dev' into eideticker
fixes to eideticker template