back to goo we go

Change-Id: I862c3fc2cc2f4e9ddb33dc853d10555e43f5ad61
INTRODUCING: Vanir BOTTLESERVICE

Change-Id: I963dac20b7068beaec6c75dae161366a052156b2

Conflicts:
	default.xml