Merge branch 'nextRelease' of ssh://turbo4.fsb.hr:2013/foam-extend into nextRelease