testing

C4S_UPDATE
View Options

			Update c4science branch from upstream
			-------------------------------------

			git fetch upstream
			git merge --squash upstream/stable
			# Fix conflict
			git commit -am "Merge with Stable Week XXX"