Merge settings & wifi manager to master

Merge settings & wifi manager to master.
the settings & wifi manager looks pretty stable now.
Need to test the integration of theses branches  with the master branch before merging.