Fix rebase issue in view
Fix rebase issue in view

sharidas/core,owncloud/core,IljaN/core,pollopolea/core,pollopolea/core,IljaN/core,IljaN/core,IljaN/core,sharidas/core,pollopolea/core,pollopolea/core,sharidas/core,owncloud/core,sharidas/core,owncloud/core,pollopolea/core,sharidas/core,owncloud/core,phil-davis/core,owncloud/core,IljaN/core