Merge branch 'master' of ssh://plrg.eecs.uci.edu/home/git/jpf-core

diff --cc main.jpf
index d9feee526e7decf025d187dee5cb1642504411c4,91b80aa600a696015d73b93de31575f816a30403..db82e7b595f6031cf16a6771c7229dfc91338899
--- 1/main.jpf
--- 2/main.jpf
+++ b/main.jpf
@@@ -17,11 -17,9 +17,11 @@@ listener=gov.nasa.jpf.listener.Variable
  # Speeches
  #variables=level,oneUser
  # Music players
- #variables=status,level,trackDescription,trackData,mute
+ variables=status,duration,level,trackDescription,trackData,mute
  # Relay switch
  #variables=currentSwitch
 +# Valves
 +variables=valve,valveLatestValue
                        
  # Potentially conflicting apps (we default to App1 and App2 for now)
  apps=App1,App2