Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/classes/com/hack/clipper/R$id.class
	bin/classes/com/hack/clipper/R$layout.class
	bin/classes/com/hack/clipper/R$string.class
	gen/com/hack/clipper/R.java