Ok let see if i am on the right track

Signed-off-by: john mcconnell  johnmcconnell@yahoo.com
Hum i bet that We would like to call the setting app by Settings and nop app

Signed-off-by: john mcconnell  johnmcconnell@yahoo.com
Merge remote-tracking branch 'upstream/master'
rename kinds no more panels

Open-WebOS-DCO-1.0-Signed-Off-By: john mcconnell  johnmcconnell@yahoo.com
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' into work
Merge remote-tracking branch 'upstream/master' into work
Ok this is a hack I know theres got to be a better way!  But it works

Open-WebOS-DCO-1.0-Signed-Off-By: john mcconnell  johnmcconnell@yahoo.com
Merge pull request #24 from micro-tech/work

Work's but i know there got to be a better way