Merge origin/dev into dev

Conflicts:
	wifi-main/logs/biwifi.log