bludroid

Conflicts:

	default.xml