some event-driven code add
Merge commit '888815b411ad3b4903cd0ffa1136253c44f54f46'

Conflicts:
	mapro/mapro.pde