fixed tutorial listeners
fixed merged conflicts
Merge pull request #55 from jcvno/emfb760/tutorial-listeners

emfb760/tutorial listeners