Merge remote-tracking branch 'origin/master'

Conflicts:
	CAMdax.r
	CAMdaxhist.r
	CAMdaxreturn.r
	CAMdaxreturnhist.r
71