MERGE : incorporate changes on cleaning branch to completelly decouple wifiview and...