Merge branch 'user-preferences-layout-option' of https://github.com/gopeter/gitlabhq

 into gopeter-user-preferences-layout-option

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>