Adding on method to device and spark
Update method name to avoid conflicts
Fix conflicts with master
Merge pull request #23 from spark/add-on-event

Adding on method to device and spark