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

Conflicts:
	app/src/main/java/com/webmanagement/thaidigitaltv/ProgramDetail.java
Merge branch 'develop' of https://github.com/godsid/thaiDigitalTV into develop