Fixed shelf processing. Threw out usless overrides
Merge branch 'master' of github.com:MediaSapiens/flamaster