Demo/ofertie tnc 2014

Bug fixes (already merged to develop) and small demo specific features for TNC 2014 demo.