yay its ready

Change-Id: I7432540c72af763dcbd74d770bbb2ea42b8bb7cc

Conflicts:
	default.xml