Merge branch 'master' of github.com:dukov/fuel-web

Change-Id: Ic0ac3b778a337a63c6f445638d0b3a1e97dbadcf