edit feature2
Merge branch 'develop' of https://github.com/godsid/thaiDigitalTV into develop

Conflicts:
	app/src/main/java/com/webmanagement/thaidigitaltv/MainActivity.java
	app/src/main/res/layout/activity_main.xml