improvement of the dialogue system
merge conflicts
Merge pull request #7 from Herzucco/pol/point_n_click

Pol/point n click