Merge branch 'master' of https://github.com/obalakirev/fuel-web-orange

Change-Id: I2f2788b615287eed90601969c79140adfd8dbb52