Bug fix: Clear All
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/builder/Controller.java