Merge remote-tracking branch 'origin/master' (VIC.4.1.2.k) into develop

Conflicts:
	samples/global.param.sample
	src/ChangeLog
	src/frozen_soil.c
	src/get_global_param.c
	src/global.h
	src/initialize_global.c
	src/initialize_model_state.c
	src/vicNl.h