Dialog System
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/gradle.xml
	app/app.iml
	ghostCatcherAndroid.iml