conforming to new payload functionality

Conflicts:
	Classes/ProfileEventHandler.cpp
	Classes/ProfileEventHandler.h
fixing merge issues