Minor and major changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/dotBottr/helper/Config.java