Refactored Scanner
Refactored Scanner

- Split up the gigantic function 'update' to bit smaller and more coherent parts

Faldon/music,paulijar/music,owncloud/music,owncloud/music,paulijar/music,Faldon/music,owncloud/music,Faldon/music,Faldon/music,paulijar/music,owncloud/music,paulijar/music,Faldon/music,owncloud/music,paulijar/music