Merge branch 'dev' into b2g
remove quotes
add docs