Refactored dialog listeners.
updated gitignore
Merge branch 'develop'