Merge branch 'refs/changes/14/103814/1' into authx

Change-Id: I0d15a3b8918399cf9e72c7d540b4b1be8ddc4d07
Merge branch 'authx' of https://github.com/loles/fuel-web into authx