Initial commit of article ordering
Merge branch 'master' into article_ordering

Conflicts:
	lib/LIXUZ/HelperModules/Live/Articles.pm
	root/css/global.css
Bumped dbrevision to 11
Added safety checks to avoid duplicate JS
Bumped api version to 2 for TEMPLATE_LAYOUT
Added ProxiedResultSet for ordered resultsets

ProxiedResultSet provides a DBIC-like API for accessing multiple DBIC
resultsets as a single object, and handles things like pagination
so that the user doesn't have to know anything about the separate
resultsets that it consists of.
Renamed spot_accupied_article to getArticleInSpot
Support layout spots properly

Also adds a get_layout_meta method to LzTemplate objects that
returns the spots, total number of spots, as well as the article
list meta entry that corresponds to the spots
Fixed editing of category layouts

Additionally, a lot of code was cleaned up
Fixed resolving of layouts
Merge branch 'master' into categoryLayouts
Merge branch 'master' into categoryLayouts
Merge branch 'master' into categoryLayouts

Conflicts:
	tools/lixuzctl
Merge branch 'master' into categoryLayouts
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