Added remove shortcut method
Added Clock
Merge remote-tracking branch 'origin/master' into emg

Conflicts:
	TVBoxLauncher/src/main/java/com/energysistem/energylauncher/tvboxlauncher/ui/LauncherActivity.java