checkpoint 2013-07-02 (headless support)
Merge remote-tracking branch 'ilastik-meta/master'