stuff
Merge branch 'develop' of github.com:maxiru/canvas-base into develop

Conflicts:
	src/main/scala/com/prizma/base/Indicators.scala
history aded