commit for pull
Merge branch 'develop' of https://github.com/godsid/thaiDigitalTV into develop

Conflicts:
	app/src/main/res/layout/activity_detail_list.xml