Merge remote-tracking branch 'upstream/develop' into develop
Merge branch 'master' into develop
Merge branch 'fix/issue_47' into develop
Merge branch 'fix/issue_71' into develop

Conflicts:
	src/Makefile
	src/display_current_settings.c
	src/read_soilparam.c
	src/read_soilparam_arc.c
	src/vicNl.c
	src/vicNl.h
	src/vicNl_def.h
Merge branch 'fix/issue_81' into develop

Conflicts:
	src/Makefile
	src/vicNl.h
Merge branch 'fix/issue_87' into develop

Conflicts:
	src/Makefile
	src/vicNl.h
Merge branch 'fix/issue_88' into develop

Conflicts:
	src/vicNl.h
Merge branch 'fix/issue_89' into develop

Conflicts:
	src/Makefile
	src/vicNl.h
Initial code move to vic_run and driver directories
Merge remote-tracking branch 'upstream/develop' into develop
Merge remote-tracking branch 'upstream/develop' into develop
Merge branch 'dev_5.0' into feature/reorg
Added readme with instructions to set up an Xcode project for VIC
Fixed typo
Fixed typo
Merge branch 'hotfix/4.1.2.l' into feature/reorg

Conflicts:
	ChangeLog
	Makefile
	drivers/classic/src/initialize_model_state.c
	vic_run/include/LAKE.h
	vic_run/include/global.h
	vic_run/include/vicNl.h
	vic_run/src/full_energy.c
	vic_run/src/lakes.eb.c
Merge pull request #1 from bartnijssen/feature/xcode

Feature/xcode
Merge branch 'dev_5.0' into feature/reorg
Removed global.h and defined global variables in vicNl.c

global.h defined a number of global variables and was only included in
vicNl.c. There is not much of an advantage to this and is likely to lead
to confusion, since all the variables are already declared as externs in
the individual files where they are used or vicNl_def.h.
Renamed vicNl_def.h to vic_def.h