Change to AXXION

Conflicts:
	tools/roomservice.py

Change-Id: I2a156cb399657fb2f6812bb788f099f9318ba72f