commit from local
Merge branch 'hydro-devel' of https://github.com/ILysvincent/wifi_ddwrt into hydro-devel

Conflicts:
	scripts/analysis
corrected the analysis script conflict