Testing for stage's conception.
tt
Merge branch 'master' of ssh://git@github.com/goalfinance/CSA.git

Conflicts:
	cistern/build.gradle