almost final
Merge branch 'tomas-develv2.0' of https://github.com/lsel2014/lsel2014 into tomas-develv2.0