Changed names on serial folder and scripts.
Merge branch 'master' into development