Goal-orienting state working?
Merge branch 'felix1' of https://github.com/cerathe/maslab-2014 into felix1