change layout to activity
Merge branch 'develop' of https://github.com/godsid/thaiDigitalTV into develop

Conflicts:
	app/src/main/java/com/webmanagement/thaidigitaltv/MainMenuTab.java
	app/src/main/res/layout/activity_setting_time_list.xml
	app/src/main/res/values/strings.xml