commit before pull
Merge branch 'master' of https://github.com/siigna/main

Conflicts:
	src/main/scala/com/siigna/module/ModuleLoader.scala
Merge remote-tracking branch 'origin/master'
CBP
CBP
Merge branch 'master' of https://github.com/siigna/main
Merge branch 'master' of https://github.com/siigna/main
 fixed arc geom
Merge branch 'master' of https://github.com/siigna/main