Test up feature
Merge branch 'develop' of https://github.com/godsid/thaiDigitalTV into develop

Conflicts:
	.idea/misc.xml
	app/app.iml
	thaiDigitalTV.iml