Merge branch 'clutter'

Conflicts:
	hi.java