Net from file is loaded correctly
Merge branch 'KM_NeuNetUI' of https://github.com/xammi/2014_Cpp_Technopark into EG_Tutor
Made Factory prettier
Merge branch 'EG_Tutor'