fix warnings
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/lib/log.h
	src/switch/switch/parse-options.c
	src/switch/switch/switch-init.c
Merge remote-tracking branch 'origin/master'