Fixed spot management
Added a count method to ProxiedResultSet
Added getOrderedArticleIDs to ProxiedResultSets

Purpose: This method is primarily as an internal interface so that objects that
return ProxiedResultSets can ensure that ordered objects are not included in
the unordered list. It returns the article IDs of all objects that are in our
ordered resultset.
Ensure that only articles present in the category gets returned
normalBuilder now filters away ordered articles

It does this by calling getOrderedArticleIDs on the proxy,
and then removing those from its own results, ending up
in much more reliable results
Fixed handling of categories with fewer articles than spots
Fixed plugin building
Merge branch 'master' into categoryLayouts