merging indicators
Merge commit '6c73abad5fb1be259ba59fc2e7c68d6ffcef2430' into develop

Conflicts:
	src/main/scala/com/prizma/base/PrizmaApp.scala