Fixed some bugs and rail change deactivated
Merge branch 'tomas-devel' of https://github.com/lsel2014/lsel2014 into tomas-devel
Fixed some bugs and woring displays