Removed References to $state, removed ampersand on subroutine call
Merge branch 'xbmc' into running