commit before pull
Merge branch 'master' of https://github.com/siigna/main
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of C:\siigna\main with conflicts.
Merge branch 'master' of https://github.com/siigna/main
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/scala/com/siigna/module/ModuleLoader.scala
Merge remote-tracking branch 'origin/master'
fixed drawing scale