some minor fixes
fixed bug(#151) with replacement character for SSID and passphrase
Merge branch 'android' into dev