Merge branch 'dev' into b2g
Merge branch 'dev' into eideticker
Merge branch 'dev' into b2g
eideticker slowdown and more logging
Merge branch 'dev' into eideticker
no change
Merge branch 'b2g' into dev
Merge branch 'dev' into eideticker
fixes to eideticker template