Continuing work on dialog system

Finished basic internal system
Need to work on file imported dialogs
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore