design activity_feature2
Merge branch 'develop' of https://github.com/godsid/thaiDigitalTV into develop

Conflicts:
	.idea/misc.xml