finish layout activity_setting_dialog
finish layout activity_setting_dialog2
Merge branch 'develop' of https://github.com/godsid/thaiDigitalTV into develop

Conflicts:
	app/src/main/res/values/strings.xml