uncrustify everything
Merge branch 'Master' into ios7Dev
fixed bug(#151) with replacement character for SSID and passphrase
Merge branch 'android' into dev
integrated StartupManager into Android app
fix bug in android implementation of startup
some code cleanings
Merge commit '1fb0c5f93de59fabe1ea1778e4070236386772d7' into ios7Dev