update to store
Merge remote-tracking branch 'origin/master'

Conflicts:
	Classes/ExampleEventHandler.cpp
	Classes/ExampleEventHandler.h