Deleting unnecessary files
Merge remote-tracking branch 'origin/master'

Conflicts:
	my.catalog/gen/my/catalog/R.java