a
Merge branch 'master' of https://github.com/carlos411/lg_tv_app

Conflicts:
	WebContent/js/custom1.js
a